From a40e527938d76ba71f211da7e327adb50384ba69 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:26:33 +0000 Subject: Moving 1.x tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835157 13f79535-47bb-0310-9956-ffa450edef68 --- tags/java/sca/1.5.1/itest/atom/pom.xml | 193 --- .../java/test/abdera/impl/NewsServiceImpl.java | 63 - .../test/java/test/abdera/NewsServiceTestCase.java | 61 - .../atom/src/test/resources/news/news.composite | 34 - .../itest/atom/src/test/resources/news/news.wsdl | 167 --- .../itest/atom/src/test/resources/news/news.xsd | 137 -- .../sca/1.5.1/itest/binding-sca-jms/client/pom.xml | 63 - .../client/src/main/java/itest/MyClientImpl.java | 32 - .../client/src/main/java/itest/MyService.java | 28 - .../main/resources/META-INF/sca-contribution.xml | 24 - .../client/src/main/resources/MyClient.composite | 29 - .../src/test/java/itest/MyClientTestCase.java | 57 - tags/java/sca/1.5.1/itest/binding-sca-jms/pom.xml | 36 - .../1.5.1/itest/binding-sca-jms/service/pom.xml | 63 - .../service/src/main/java/itest/MyService.java | 28 - .../service/src/main/java/itest/MyServiceImpl.java | 28 - .../main/resources/META-INF/sca-contribution.xml | 24 - .../service/src/main/resources/MyService.composite | 28 - .../src/test/java/itest/MyServiceTestCase.java | 52 - .../1.5.1/itest/bpel/helloworld-reference/pom.xml | 210 --- .../src/test/java/greetings/GreetingsService.java | 31 - .../test/java/greetings/GreetingsServiceImpl.java | 33 - .../src/test/java/greetings/GreetingsTestCase.java | 60 - .../test/java/helloworld/HelloWorldService.java | 29 - .../java/helloworld/HelloWorldServiceImpl.java | 47 - .../test/java/helloworld/HelloWorldTestCase.java | 55 - .../test/resources/greetings/greetings.composite | 32 - .../src/test/resources/greetings/greetings.wsdl | 87 -- .../src/test/resources/helloworld/helloworld.bpel | 84 -- .../test/resources/helloworld/helloworld.composite | 36 - .../src/test/resources/helloworld/helloworld.wsdl | 82 -- .../src/test/resources/log4j.properties | 36 - .../sca/1.5.1/itest/bpel/helloworld-ws/pom.xml | 176 --- .../src/test/java/helloworld/HelloWorld.java | 45 - .../test/java/helloworld/HelloWorldTestCase.java | 64 - .../src/test/resources/helloworld/helloworld.bpel | 66 - .../test/resources/helloworld/helloworld.composite | 32 - .../src/test/resources/helloworld/helloworld.wsdl | 82 -- .../src/test/resources/log4j.properties | 36 - tags/java/sca/1.5.1/itest/bpel/helloworld/pom.xml | 162 --- .../src/test/java/helloworld/HelloWorld.java | 45 - .../test/java/helloworld/HelloWorldTestCase.java | 63 - .../src/test/resources/helloworld/helloworld.bpel | 66 - .../test/resources/helloworld/helloworld.composite | 36 - .../src/test/resources/helloworld/helloworld.wsdl | 82 -- .../helloworld/src/test/resources/log4j.properties | 36 - tags/java/sca/1.5.1/itest/bpel/pom.xml | 37 - .../java/sca/1.5.1/itest/build-was-integration.xml | 68 - tags/java/sca/1.5.1/itest/builder/pom.xml | 106 -- .../tuscany/sca/itest/builder/ComponentDImpl.java | 45 - .../ComponentDReferenceMultiplicityImpl.java | 48 - .../tuscany/sca/itest/builder/ComponentEImpl.java | 36 - .../tuscany/sca/itest/builder/ComponentFImpl.java | 36 - .../apache/tuscany/sca/itest/builder/Service3.java | 33 - .../tuscany/sca/itest/builder/Service3a.java | 33 - .../scenario1/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario1/scenario1.composite | 45 - .../main/resources/scenario1/scenario1a.composite | 47 - .../scenario10/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario10/scenario10.composite | 62 - .../resources/scenario10/scenario10a.composite | 61 - .../src/main/resources/scenario10/service3.wsdl | 63 - .../scenario11/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario11/scenario11.composite | 59 - .../resources/scenario11/scenario11a.composite | 64 - .../src/main/resources/scenario11/service3.wsdl | 63 - .../scenario12/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario12/scenario12.composite | 58 - .../resources/scenario12/scenario12a.composite | 64 - .../scenario13/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario13/scenario13.composite | 58 - .../resources/scenario13/scenario13a.composite | 64 - .../scenario2/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario2/scenario2.composite | 45 - .../main/resources/scenario2/scenario2a.composite | 47 - .../scenario3/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario3/scenario3.composite | 44 - .../main/resources/scenario3/scenario3a.composite | 48 - .../scenario4/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario4/scenario4.composite | 44 - .../main/resources/scenario4/scenario4a.composite | 48 - .../scenario5/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario5/scenario5.composite | 46 - .../main/resources/scenario5/scenario5a.composite | 47 - .../src/main/resources/scenario5/scenarios.wsdl | 63 - .../scenario6/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario6/scenario6.composite | 47 - .../main/resources/scenario6/scenario6a.composite | 47 - .../src/main/resources/scenario6/scenarios.wsdl | 63 - .../scenario7/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario7/scenario7.composite | 45 - .../main/resources/scenario7/scenario7a.composite | 49 - .../src/main/resources/scenario7/scenarios.wsdl | 63 - .../scenario8/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario8/scenario8.composite | 44 - .../main/resources/scenario8/scenario8a.composite | 50 - .../src/main/resources/scenario8/scenarios.wsdl | 63 - .../scenario9/META-INF/sca-contribution.xml | 24 - .../main/resources/scenario9/scenario9.composite | 60 - .../main/resources/scenario9/scenario9a.composite | 61 - .../tuscany/sca/itest/builder/BuilderTestCase.java | 805 ----------- .../builder/CompositeBuilderNonWiringImpl.java | 176 --- .../sca/itest/builder/CustomCompositeBuilder.java | 210 --- .../tuscany/sca/itest/builder/TestUtils.java | 203 --- .../sca/1.5.1/itest/callablereferences-ws/pom.xml | 59 - .../src/main/java/com/example/ExampleClient.java | 26 - .../main/java/com/example/ExampleClientImpl.java | 59 - .../src/main/java/com/example/ExampleService.java | 30 - .../main/java/com/example/ExampleServiceImpl.java | 33 - .../sca/itest/callablerefwsreturn/Alpha.java | 26 - .../sca/itest/callablerefwsreturn/AlphaImpl.java | 96 -- .../sca/itest/callablerefwsreturn/Beta.java | 27 - .../sca/itest/callablerefwsreturn/BetaImpl.java | 46 - .../sca/itest/callablerefwsreturn/Gamma.java | 34 - .../sca/itest/callablerefwsreturn/GammaImpl.java | 49 - .../CallableReferenceWsReturnTest.composite | 54 - .../src/main/resources/example.composite | 40 - .../src/test/java/com/example/ExampleTestCase.java | 44 - .../CallableReferenceReturnTestCase.java | 49 - .../sca/1.5.1/itest/callablereferences/pom.xml | 81 -- .../tuscany/sca/itest/callableref/AComponent.java | 39 - .../sca/itest/callableref/AComponentImpl.java | 114 -- .../tuscany/sca/itest/callableref/BComponent.java | 30 - .../sca/itest/callableref/BComponentImpl.java | 38 - .../tuscany/sca/itest/callableref/CComponent.java | 27 - .../sca/itest/callableref/CComponentImpl.java | 30 - .../tuscany/sca/itest/callableref/DComponent.java | 30 - .../sca/itest/callableref/DComponentImpl.java | 65 - .../ConversationalService.java | 68 - .../ConversationalServiceImpl.java | 111 -- .../tuscany/sca/itest/callablerefreturn/Alpha.java | 27 - .../sca/itest/callablerefreturn/AlphaImpl.java | 86 -- .../tuscany/sca/itest/callablerefreturn/Beta.java | 28 - .../sca/itest/callablerefreturn/BetaImpl.java | 44 - .../tuscany/sca/itest/callablerefreturn/Gamma.java | 35 - .../sca/itest/callablerefreturn/GammaImpl.java | 47 - .../CallableReferenceConversationalTest.composite | 29 - .../CallableReferenceReturnTest.composite | 39 - .../main/resources/CallableReferenceTest.composite | 45 - .../src/main/resources/nodeA/CompositeA.composite | 46 - .../resources/nodeA/META-INF/sca-contribution.xml | 22 - .../src/main/resources/nodeB/CompositeB.composite | 43 - .../resources/nodeB/META-INF/sca-contribution.xml | 22 - .../CallableReferenceConversationalTestCase.java | 109 -- .../CallableReferenceRemoteTestCase.java | 145 -- .../CallableReferenceReturnTestCase.java | 48 - .../callableref/CallableReferenceTestCase.java | 83 -- tags/java/sca/1.5.1/itest/callback-api/pom.xml | 50 - .../tuscany/sca/test/CallBackApiCallBack.java | 38 - .../apache/tuscany/sca/test/CallBackApiClient.java | 30 - .../tuscany/sca/test/CallBackApiClientImpl.java | 206 --- .../tuscany/sca/test/CallBackApiService.java | 50 - .../tuscany/sca/test/CallBackApiServiceImpl.java | 123 -- .../src/main/resources/CallBackApiTest.composite | 33 - .../main/resources/META-INF/sca-contribution.xml | 23 - .../tuscany/sca/test/CallBackApiTestCase.java | 62 - tags/java/sca/1.5.1/itest/callback-basic/pom.xml | 50 - .../tuscany/sca/test/CallBackBasicCallBack.java | 33 - .../tuscany/sca/test/CallBackBasicClient.java | 28 - .../tuscany/sca/test/CallBackBasicClientImpl.java | 135 -- .../tuscany/sca/test/CallBackBasicService.java | 37 - .../tuscany/sca/test/CallBackBasicServiceImpl.java | 59 - .../src/main/resources/CallBackBasicTest.composite | 33 - .../main/resources/META-INF/sca-contribution.xml | 23 - .../tuscany/sca/test/CallBackBasicTestCase.java | 50 - .../sca/1.5.1/itest/callback-complex-type/pom.xml | 45 - .../tuscany/sca/test/CallBackCTypeCallBack.java | 33 - .../tuscany/sca/test/CallBackCTypeClient.java | 28 - .../tuscany/sca/test/CallBackCTypeClientImpl.java | 142 -- .../tuscany/sca/test/CallBackCTypeService.java | 36 - .../tuscany/sca/test/CallBackCTypeServiceImpl.java | 62 - .../main/resources/CallBackCTypeClient.composite | 33 - .../test/CallBackCTypeServiceImpl.componentType | 28 - .../sca/test/CallBackCTypeTestCaseFIXME.java | 48 - .../1.5.1/itest/callback-composite-scope/pom.xml | 53 - .../org/apache/tuscany/sca/test/Helloworld.java | 34 - .../tuscany/sca/test/HelloworldCallback.java | 32 - .../tuscany/sca/test/HelloworldDelegate.java | 32 - .../tuscany/sca/test/HelloworldDelegateImpl.java | 60 - .../apache/tuscany/sca/test/HelloworldImpl.java | 46 - .../main/resources/HelloworldDelegate.composite | 42 - .../main/resources/META-INF/sca-contribution.xml | 26 - .../apache/tuscany/sca/test/CallbackTestCase.java | 66 - tags/java/sca/1.5.1/itest/callback-id/pom.xml | 45 - .../tuscany/sca/test/CallBackIdCallBack.java | 31 - .../apache/tuscany/sca/test/CallBackIdClient.java | 28 - .../tuscany/sca/test/CallBackIdClientImpl.java | 147 -- .../apache/tuscany/sca/test/CallBackIdService.java | 33 - .../tuscany/sca/test/CallBackIdServiceImpl.java | 48 - .../src/main/resources/CallBackIdClient.composite | 33 - .../tuscany/sca/test/CallBackIdTestCase.java | 45 - .../1.5.1/itest/callback-multiple-wires/pom.xml | 45 - .../apache/tuscany/sca/test/callback/MyClient.java | 27 - .../tuscany/sca/test/callback/MyClientImpl1.java | 49 - .../tuscany/sca/test/callback/MyClientImpl2.java | 49 - .../tuscany/sca/test/callback/MyService.java | 32 - .../sca/test/callback/MyServiceCallback.java | 27 - .../tuscany/sca/test/callback/MyServiceImpl.java | 45 - .../main/resources/CallbackMultiWireTest.composite | 38 - .../test/callback/CallbackMultiWireTestCase.java | 55 - .../1.5.1/itest/callback-separatethread/pom.xml | 45 - .../sca/itest/CallBackSeparateThreadClient.java | 34 - .../itest/CallBackSeparateThreadClientImpl.java | 172 --- .../tuscany/sca/itest/EventProcessorCallBack.java | 38 - .../tuscany/sca/itest/EventProcessorService.java | 48 - .../sca/itest/EventProcessorServiceImpl.java | 197 --- .../resources/CallBackSeparateThreadTest.composite | 31 - .../sca/itest/CallBackSeparateThreadTestCase.java | 64 - .../sca/1.5.1/itest/callback-set-callback/pom.xml | 45 - .../sca/test/CallBackSetCalbackService.java | 34 - .../sca/test/CallBackSetCallbackBadCallback.java | 38 - .../sca/test/CallBackSetCallbackCallback.java | 31 - .../sca/test/CallBackSetCallbackCallbackImpl.java | 66 - .../sca/test/CallBackSetCallbackClient.java | 28 - .../sca/test/CallBackSetCallbackClientImpl.java | 190 --- .../test/CallBackSetCallbackObjectCallback.java | 44 - .../sca/test/CallBackSetCallbackServiceImpl.java | 73 - .../resources/CallBackSetCallbackTest.composite | 37 - .../sca/test/CallBackSetCallbackTestCase.java | 49 - .../1.5.1/itest/callback-set-conversation/pom.xml | 45 - .../test/CallBackSetCallbackConvBadCallback.java | 39 - .../sca/test/CallBackSetCallbackConvCallback.java | 34 - .../sca/test/CallBackSetCallbackConvClient.java | 28 - .../test/CallBackSetCallbackConvClientImpl.java | 163 --- .../CallBackSetCallbackConvNonSerCallback.java | 56 - .../CallBackSetCallbackConvObjectCallback.java | 52 - .../sca/test/CallBackSetCallbackConvService.java | 36 - .../test/CallBackSetCallbackConvServiceImpl.java | 98 -- .../CallBackSetCallbackConvTest.composite | 33 - .../sca/test/CallBackSetCallbackConvTestCase.java | 48 - tags/java/sca/1.5.1/itest/component-type/pom.xml | 47 - .../src/main/java/calculator/AddService.java | 28 - .../src/main/java/calculator/AddServiceImpl.java | 30 - .../src/main/java/calculator/CalculatorClient.java | 45 - .../main/java/calculator/CalculatorService.java | 35 - .../java/calculator/CalculatorServiceImpl.java | 63 - .../src/main/java/calculator/DivideService.java | 28 - .../main/java/calculator/DivideServiceImpl.java | 30 - .../src/main/java/calculator/MultiplyService.java | 28 - .../main/java/calculator/MultiplyServiceImpl.java | 30 - .../src/main/java/calculator/SubtractService.java | 28 - .../main/java/calculator/SubtractServiceImpl.java | 30 - .../src/main/resources/Calculator.composite | 49 - .../calculator/AddServiceImpl.componentType | 27 - .../calculator/CalculatorServiceImpl.componentType | 43 - .../calculator/DivideServiceImpl.componentType | 27 - .../calculator/MultiplyServiceImpl.componentType | 27 - .../calculator/SubtractServiceImpl.componentType | 27 - .../test/java/calculator/CalculatorTestCase.java | 52 - .../contribution-classes/build-jar.xml | 39 - .../contribution-classes/pom.xml | 203 --- .../main/java/supplychain/customer/Customer.java | 35 - .../customer/JavaCustomerComponentImpl.java | 63 - .../illegal/JavaCustomerComponentImpl.java | 74 - .../retailer/JavaRetailerComponentImpl.java | 61 - .../main/java/supplychain/retailer/Retailer.java | 28 - .../shipper/JavaShipperComponentImpl.java | 52 - .../src/main/java/supplychain/shipper/Shipper.java | 28 - .../warehouse/JavaWarehouseComponentImpl.java | 47 - .../main/java/supplychain/warehouse/Warehouse.java | 28 - .../complete-supplychain-sca-contribution.xml | 26 - .../META-INF/customer-impl-sca-contribution.xml | 26 - .../customer-interface-sca-contribution.xml | 26 - .../META-INF/customer-sca-contribution.xml | 25 - .../META-INF/illegal-customer-sca-contribution.xml | 26 - .../illegal1-supplychain-sca-contribution.xml | 24 - .../illegal2-supplychain-sca-contribution.xml | 31 - .../META-INF/retailer-sca-contribution.xml | 25 - .../META-INF/shipper-sca-contribution.xml | 25 - .../META-INF/supplychain-sca-contribution.xml | 30 - .../META-INF/warehouse-sca-contribution.xml | 25 - .../supplychain/illegalsupplychain.composite | 48 - .../resources/supplychain/supplychain.composite | 48 - .../JavaWarehouseComponentImpl.componentType | 28 - .../contribution-test/pom.xml | 60 - .../test/contribution/ContributionTestCase.java | 373 ----- .../tuscany/sca/test/contribution/SupplyChain.java | 231 ---- .../TuscanyClassloadingTestCaseFIXME.java | 381 ------ .../1.5.1/itest/contribution-classloader/pom.xml | 51 - .../sca/1.5.1/itest/contribution-folder/pom.xml | 51 - .../src/test/java/ContributionFolderTestCase.java | 53 - .../src/test/java/ContributionZIPTestCase.java | 53 - .../test/java/calculator/CalculatorService.java | 31 - .../folderWithJars/Calculator.composite | 49 - .../folderWithJars/META-INF/sca-contribution.xml | 23 - .../repository2/folderWithJars/service.jar | Bin 2131 -> 0 bytes .../repository2/folderWithJars/serviceImpl.jar | Bin 3641 -> 0 bytes .../test/resources/repository3/contribution.zip | Bin 5478 -> 0 bytes .../export-composite/pom.xml | 67 - .../src/main/java/hello/Hello.java | 30 - .../src/main/java/hello/HelloImpl.java | 33 - .../main/resources/META-INF/sca-contribution.xml | 25 - .../src/main/resources/hello.composite | 31 - .../sca/test/contribution/HelloTestCase.java | 91 -- .../contribution-import-export/export-java/pom.xml | 67 - .../main/java/helloworld/HelloWorldService.java | 30 - .../main/resources/META-INF/sca-contribution.xml | 24 - .../helloworld/HelloWorldImpl.componentType | 30 - .../export-resource/pom.xml | 31 - .../main/resources/META-INF/sca-contribution.xml | 24 - .../src/main/resources/ufservices/store.html | 27 - .../contribution-import-export/export-wsdl/pom.xml | 31 - .../main/resources/META-INF/sca-contribution.xml | 24 - .../export-wsdl/src/main/resources/helloworld.wsdl | 76 - .../export-wsdl/src/main/resources/helloworld.xsd | 35 - .../import-composite/pom.xml | 73 - .../src/main/java/helloworld/HelloWorldImpl.java | 38 - .../src/main/java/helloworld/HelloWorldServer.java | 46 - .../main/java/helloworld/HelloWorldService.java | 30 - .../main/resources/META-INF/sca-contribution.xml | 27 - .../src/main/resources/helloworld.wsdl | 76 - .../src/main/resources/helloworld.xsd | 35 - .../src/main/resources/helloworldws.composite | 39 - .../contribution/HelloWorldServerTestCase.java | 126 -- .../contribution-import-export/import-java/pom.xml | 73 - .../src/main/java/helloworld/HelloWorldImpl.java | 33 - .../main/resources/META-INF/sca-contribution.xml | 25 - .../src/main/resources/helloworldws.composite | 29 - .../contribution/HelloWorldServerTestCase.java | 127 -- .../import-resource/pom.xml | 102 -- .../main/resources/META-INF/sca-contribution.xml | 25 - .../src/main/resources/store.composite | 33 - .../sca/test/contribution/StoreTestCase.java | 129 -- .../contribution-import-export/import-wsdl/pom.xml | 73 - .../src/main/java/helloworld/HelloWorldImpl.java | 33 - .../src/main/java/helloworld/HelloWorldServer.java | 46 - .../main/java/helloworld/HelloWorldService.java | 30 - .../main/resources/META-INF/sca-contribution.xml | 25 - .../src/main/resources/helloworldws.composite | 33 - .../contribution/HelloWorldServerTestCase.java | 137 -- .../1.5.1/itest/contribution-import-export/pom.xml | 56 - .../pom.xml | 103 -- .../application/META-INF/application.composite | 48 - .../ear-appcomp-contrib-implicit/pom.xml | 103 -- .../application/META-INF/application.composite | 62 - .../src/main/resources/isthisignored.composite | 49 - .../ear-nonenhanced/pom.xml | 90 -- .../ejb-appcomp-contrib-implicit/pom.xml | 68 - .../main/java/sample/ejb3/HelloworldService.java | 33 - .../java/sample/ejb3/HelloworldServiceBean.java | 40 - .../src/main/resources/META-INF/ejb-jar.composite | 35 - .../src/main/resources/META-INF/openejb-jar.xml | 32 - .../contribution-jee-samples/ejb-enhanced/pom.xml | 68 - .../main/java/sample/ejb3/HelloworldLocal8.java | 33 - .../main/java/sample/ejb3/HelloworldService8.java | 33 - .../java/sample/ejb3/HelloworldService8Bean.java | 50 - .../src/main/resources/META-INF/openejb-jar.xml | 32 - .../src/main/resources/isthisignored.composite | 49 - .../ejb-nonenhanced/pom.xml | 68 - .../main/java/sample/ejb3/HelloworldLocal7.java | 33 - .../main/java/sample/ejb3/HelloworldService7.java | 33 - .../java/sample/ejb3/HelloworldService7Bean.java | 41 - .../java/sample/ejb3/HelloworldService7aBean.java | 41 - .../src/main/resources/META-INF/openejb-jar.xml | 32 - .../contribution-jee-samples/jar-shared/pom.xml | 72 - .../java/sample/java/HelloworldServiceJava.java | 33 - .../sample/java/HelloworldServiceJavaImpl.java | 36 - .../src/main/java/sample/java/JarMain.java | 24 - .../1.5.1/itest/contribution-jee-samples/pom.xml | 59 - .../scajar-ear-appcomp-war-appcomp/pom.xml | 72 - .../main/java/sample/ejb3/HelloworldService.java | 33 - .../java/sample/java/HelloworldServiceJava.java | 28 - .../main/java/sample/pojo/HelloworldClient2.java | 25 - .../java/sample/pojo/HelloworldClient2Impl.java | 39 - .../java/sample/pojo/HelloworldTargetImpl.java | 29 - .../src/main/resources/helloworld.composite | 40 - .../scajar-ear-appcomp/pom.xml | 72 - .../main/java/sample/ejb3/HelloworldService.java | 33 - .../java/sample/java/HelloworldServiceJava.java | 28 - .../main/java/sample/pojo/HelloworldClient2.java | 25 - .../java/sample/pojo/HelloworldClient2Impl.java | 39 - .../java/sample/pojo/HelloworldTargetImpl.java | 29 - .../src/main/resources/helloworld.composite | 40 - .../scajar-ear-nonenhanced/pom.xml | 72 - .../main/java/sample/ejb3/HelloworldService.java | 33 - .../main/java/sample/pojo/HelloworldClient.java | 25 - .../java/sample/pojo/HelloworldClientImpl.java | 34 - .../src/main/resources/helloworld.composite | 34 - .../scazip-ejb-appcomp/build.xml | 24 - .../scazip-ejb-appcomp/pom.xml | 135 -- .../main/java/sample/ejb3/HelloworldService.java | 33 - .../main/java/sample/pojo/HelloworldClient.java | 25 - .../java/sample/pojo/HelloworldClientImpl.java | 34 - .../src/main/resources/helloworld.composite | 34 - .../scazip-war-appcomp/build.xml | 24 - .../scazip-war-appcomp/pom.xml | 136 -- .../main/java/sample/ejb3/HelloworldService.java | 33 - .../main/java/sample/pojo/HelloworldClient.java | 25 - .../java/sample/pojo/HelloworldClientImpl.java | 34 - .../src/main/resources/helloworld.composite | 29 - .../war-appcomp-contrib-implicit/pom.xml | 66 - .../src/main/java/sample/HelloworldEjbServlet.java | 66 - .../main/java/sample/ejb3/HelloworldService.java | 33 - .../src/main/webapp/WEB-INF/geronimo-web.xml | 49 - .../src/main/webapp/WEB-INF/web.composite | 36 - .../src/main/webapp/WEB-INF/web.xml | 41 - .../src/main/webapp/hello.html | 50 - .../war-nonenhanced/pom.xml | 66 - .../src/main/java/sample/HelloworldEjbServlet.java | 63 - .../main/java/sample/ejb3/HelloworldService.java | 33 - .../src/main/webapp/WEB-INF/geronimo-web.xml | 49 - .../src/main/webapp/WEB-INF/web.xml | 41 - .../war-nonenhanced/src/main/webapp/hello.html | 50 - tags/java/sca/1.5.1/itest/contribution-jee/pom.xml | 183 --- .../jee/TestEJBImplementationProvider.java | 48 - .../jee/TestEJBImplementationProviderFactory.java | 47 - .../jee/TestExternalEarModelResolver.java | 141 -- ...tuscany.sca.contribution.resolver.ModelResolver | 18 - ...cany.sca.provider.ImplementationProviderFactory | 19 - .../jee/ContributionServiceTestCase.java | 329 ----- .../test/contribution/jee/EjbAppcompTestCase.java | 110 -- .../contribution/jee/SCAJarEarAppcompTestCase.java | 124 -- .../jee/SCAJarEarAppcompWarAppcompTestCase.java | 125 -- .../jee/SCAJarEarNonenhancedTestCase.java | 139 -- .../contribution/jee/SCAZipEjbAppcompTestCase.java | 112 -- .../contribution/jee/SCAZipWarAppcompTestCase.java | 114 -- .../jee/WARAppcompContribImplicitTestCase.java | 86 -- .../test/contribution/jee/WarAppcompTestCase.java | 110 -- .../src/test/resources/repository/enhanced-app.ear | Bin 16071 -> 0 bytes .../resources/repository/helloworld-ejb-w-dep.jar | Bin 10764 -> 0 bytes .../test/resources/repository/helloworld-ejb.ear | Bin 21310 -> 0 bytes .../test/resources/repository/helloworld-ejb.jar | Bin 10740 -> 0 bytes .../resources/repository/helloworld-service.jar | Bin 7711 -> 0 bytes .../resources/repository/helloworld-web-w-dep.war | Bin 16238 -> 0 bytes .../test/resources/repository/helloworld-web.war | Bin 16209 -> 0 bytes .../test/resources/repository/simple-app-ear.jar | Bin 16204 -> 0 bytes .../src/test/resources/repository/simple-app.ear | Bin 16291 -> 0 bytes .../sca/1.5.1/itest/contribution-multiple/pom.xml | 51 - .../src/test/java/hello/Hello.java | 27 - .../src/test/java/hello/HelloImpl.java | 33 - .../src/test/java/helloworld/HelloWorldImpl.java | 38 - .../test/java/helloworld/HelloWorldService.java | 28 - .../java/test/ContributionCycleTestCaseFIXME.java | 121 -- .../test/ContributionMultipleTestCaseFIXME.java | 131 -- .../src/test/java/test/ContributionTestCase.java | 145 -- .../META-INF/sca-contribution.xml | 26 - .../contribution-cycle-export/hello.composite | 31 - .../META-INF/sca-contribution.xml | 26 - .../helloworld_one.composite | 35 - .../META-INF/sca-contribution.xml | 25 - .../resources/contribution-export/hello.composite | 31 - .../META-INF/sca-contribution.xml | 26 - .../helloworld_one.composite | 35 - .../META-INF/sca-contribution.xml | 26 - .../helloworld_two.composite | 35 - tags/java/sca/1.5.1/itest/contribution/pom.xml | 52 - .../src/main/java/calculator/AddService.java | 32 - .../src/main/java/calculator/AddServiceImpl.java | 30 - .../src/main/java/calculator/CalculatorClient.java | 46 - .../main/java/calculator/CalculatorService.java | 35 - .../java/calculator/CalculatorServiceImpl.java | 70 - .../src/main/java/calculator/DivideService.java | 32 - .../main/java/calculator/DivideServiceImpl.java | 30 - .../src/main/java/calculator/MultiplyService.java | 33 - .../main/java/calculator/MultiplyServiceImpl.java | 30 - .../src/main/java/calculator/SubtractService.java | 33 - .../main/java/calculator/SubtractServiceImpl.java | 30 - .../src/main/resources/ContributionTest.composite | 24 - .../main/resources/calculator/Calculator.composite | 51 - .../main/resources/calculator/sca-contribution.xml | 24 - .../contribution/ContributionServiceTestCase.java | 218 --- .../resources/deployables/sample-calculator.jar | Bin 26901 -> 0 bytes .../resources/repository/sample-calculator.jar | Bin 26901 -> 0 bytes tags/java/sca/1.5.1/itest/conversations-ws/pom.xml | 60 - .../itest/conversational/BusinessException.java | 41 - .../conversational/ConversationIdService.java | 29 - .../conversational/ConversationalCallback.java | 50 - .../itest/conversational/ConversationalClient.java | 50 - .../ConversationalReferenceClient.java | 36 - .../conversational/ConversationalService.java | 58 - ...ersationalServiceNonConversationalCallback.java | 59 - .../conversational/NonConversationalCallback.java | 42 - .../impl/ConversationAgeComponentImpl.java | 76 - .../impl/ConversationIdComponentImpl.java | 48 - .../impl/ConversationMaxIdleComponentImpl.java | 76 - .../impl/ConversationalClientStatefulImpl.java | 322 ----- ...lientStatefulNonConversationalCallbackImpl.java | 311 ----- .../impl/ConversationalClientStatelessImpl.java | 318 ----- .../impl/ConversationalReferenceClientImpl.java | 43 - .../impl/ConversationalServiceRequestImpl.java | 124 -- .../impl/ConversationalServiceStatefulImpl.java | 119 -- ...rviceStatefulNonConversationalCallbackImpl.java | 118 -- .../impl/ConversationalServiceStatelessImpl.java | 122 -- .../ConversationalServiceStatelessScopeImpl.java | 94 -- .../Conversational/META-INF/sca-contribution.xml | 22 - .../Conversational/conversational.composite | 169 --- .../ConversationalServiceStateful.wsdl | 383 ------ .../META-INF/sca-contribution.xml | 22 - .../conversationalWSDL.composite | 46 - .../conversational/ConversationWSDLTestCase.java | 75 - .../NonConversationalCallbackTestCase.java | 198 --- .../itest/conversational/RequestScopeTestCase.java | 209 --- .../conversational/StatefulStatefulTestCase.java | 193 --- .../conversational/StatefulStatelessTestCase.java | 193 --- .../conversational/StatelessStatefulTestCase.java | 205 --- .../conversational/StatelessStatelessTestCase.java | 192 --- tags/java/sca/1.5.1/itest/conversations/pom.xml | 45 - .../java/org/apache/tuscany/sca/itest/Record.java | 29 - .../org/apache/tuscany/sca/itest/TestResult.java | 36 - .../tuscany/sca/itest/conversational/AService.java | 56 - .../tuscany/sca/itest/conversational/Alpha.java | 32 - .../tuscany/sca/itest/conversational/BService.java | 42 - .../tuscany/sca/itest/conversational/Beta.java | 31 - .../tuscany/sca/itest/conversational/CService.java | 42 - .../sca/itest/conversational/Constants.java | 25 - .../conversational/ConversationIdService.java | 29 - .../conversational/ConversationalCallback.java | 50 - .../itest/conversational/ConversationalClient.java | 50 - .../ConversationalReferenceClient.java | 36 - .../conversational/ConversationalService.java | 62 - ...ersationalServiceNonConversationalCallback.java | 62 - .../tuscany/sca/itest/conversational/DService.java | 46 - .../tuscany/sca/itest/conversational/Gamma.java | 41 - .../conversational/NonConversationalCallback.java | 46 - .../itest/conversational/impl/AServiceImpl.java | 111 -- .../sca/itest/conversational/impl/AlphaImpl.java | 70 - .../itest/conversational/impl/BServiceImpl.java | 73 - .../sca/itest/conversational/impl/BetaImpl.java | 51 - .../itest/conversational/impl/CServiceImpl.java | 85 -- .../impl/ConversationAgeComponentImpl.java | 75 - .../impl/ConversationIdComponentImpl.java | 48 - .../impl/ConversationMaxIdleComponentImpl.java | 75 - .../impl/ConversationalClientStatefulImpl.java | 321 ----- ...lientStatefulNonConversationalCallbackImpl.java | 310 ----- .../impl/ConversationalClientStatelessImpl.java | 317 ----- .../impl/ConversationalReferenceClientImpl.java | 43 - .../impl/ConversationalServiceRequestImpl.java | 123 -- .../impl/ConversationalServiceStatefulImpl.java | 117 -- ...rviceStatefulNonConversationalCallbackImpl.java | 117 -- .../impl/ConversationalServiceStatelessImpl.java | 123 -- .../ConversationalServiceStatelessScopeImpl.java | 93 -- .../itest/conversational/impl/DServiceImpl.java | 71 - .../sca/itest/conversational/impl/GammaImpl.java | 66 - .../src/main/resources/ConversationAge.composite | 31 - .../main/resources/ConversationUniqueId.composite | 53 - .../src/main/resources/conversationId.composite | 27 - .../main/resources/conversationLifetime.composite | 33 - .../src/main/resources/conversational.composite | 99 -- .../conversational/ConversationIdTestCase.java | 54 - .../ConversationLifetimeTestCase.java | 203 --- .../ConversationUniqueIdTestCase.java | 71 - .../conversational/ConversationalAgeTestCase.java | 103 -- .../conversational/ConversationalJ2SETestCase.java | 84 -- .../conversational/ConversationalTestCase.java | 649 --------- tags/java/sca/1.5.1/itest/corba/pom.xml | 168 --- .../sca/test/corba/ScenarioFiveTestCase.java | 51 - .../sca/test/corba/ScenarioFourTestCase.java | 149 -- .../sca/test/corba/ScenarioOneTestCase.java | 371 ----- .../sca/test/corba/ScenarioSixTestCase.java | 228 --- .../sca/test/corba/ScenarioThreeTestCase.java | 130 -- .../sca/test/corba/ScenarioTwoTestCase.java | 139 -- .../tuscany/sca/test/corba/TestCorbaHost.java | 56 - .../test/corba/TestCorbaHostModuleActivator.java | 41 - .../sca/test/corba/generated/AnnotatedStruct.java | 43 - .../corba/generated/AnnotatedStructHelper.java | 97 -- .../corba/generated/AnnotatedStructHolder.java | 57 - .../tuscany/sca/test/corba/generated/Color.java | 61 - .../sca/test/corba/generated/ColorHelper.java | 72 - .../sca/test/corba/generated/ColorHolder.java | 57 - .../sca/test/corba/generated/InnerStruct.java | 47 - .../test/corba/generated/InnerStructHelper.java | 112 -- .../test/corba/generated/InnerStructHolder.java | 57 - .../sca/test/corba/generated/InnerUnion.java | 130 -- .../sca/test/corba/generated/InnerUnionHelper.java | 124 -- .../sca/test/corba/generated/InnerUnionHolder.java | 56 - .../test/corba/generated/LongSequenceHelper.java | 79 -- .../test/corba/generated/LongSequenceHolder.java | 58 - .../sca/test/corba/generated/RichStruct.java | 47 - .../sca/test/corba/generated/RichStructHelper.java | 110 -- .../sca/test/corba/generated/RichStructHolder.java | 57 - .../sca/test/corba/generated/RichUnion.java | 195 --- .../sca/test/corba/generated/RichUnionHelper.java | 175 --- .../sca/test/corba/generated/RichUnionHolder.java | 56 - .../sca/test/corba/generated/ScenarioOne.java | 32 - .../test/corba/generated/ScenarioOneHelper.java | 104 -- .../test/corba/generated/ScenarioOneHolder.java | 57 - .../corba/generated/ScenarioOneOperations.java | 33 - .../sca/test/corba/generated/ScenarioSix.java | 32 - .../test/corba/generated/ScenarioSixHelper.java | 104 -- .../test/corba/generated/ScenarioSixHolder.java | 57 - .../corba/generated/ScenarioSixOperations.java | 35 - .../sca/test/corba/generated/ScenarioTwo.java | 34 - .../test/corba/generated/ScenarioTwoHelper.java | 106 -- .../test/corba/generated/ScenarioTwoHolder.java | 59 - .../corba/generated/ScenarioTwoOperations.java | 36 - .../test/corba/generated/StringArrayHelper.java | 95 -- .../test/corba/generated/StringArrayHolder.java | 58 - .../test/corba/generated/StringSequenceHelper.java | 81 -- .../test/corba/generated/StringSequenceHolder.java | 58 - .../corba/generated/TwoDimLongSequenceHelper.java | 83 -- .../corba/generated/TwoDimLongSequenceHolder.java | 58 - .../test/corba/generated/UnexpectedException.java | 52 - .../corba/generated/UnexpectedExceptionHelper.java | 98 -- .../corba/generated/UnexpectedExceptionHolder.java | 57 - .../sca/test/corba/generated/WrongColor.java | 55 - .../sca/test/corba/generated/WrongColorHelper.java | 105 -- .../sca/test/corba/generated/WrongColorHolder.java | 57 - .../test/corba/generated/_ScenarioOneImplBase.java | 91 -- .../sca/test/corba/generated/_ScenarioOneStub.java | 84 -- .../test/corba/generated/_ScenarioSixImplBase.java | 105 -- .../sca/test/corba/generated/_ScenarioSixStub.java | 119 -- .../test/corba/generated/_ScenarioTwoImplBase.java | 93 -- .../sca/test/corba/generated/_ScenarioTwoStub.java | 99 -- .../tuscany/sca/test/corba/types/ScenarioFive.java | 33 - .../test/corba/types/ScenarioFiveComponent.java | 41 - .../sca/test/corba/types/ScenarioFiveImpl.java | 32 - .../tuscany/sca/test/corba/types/ScenarioFour.java | 38 - .../test/corba/types/ScenarioFourComponent.java | 41 - .../test/corba/types/ScenarioFourException.java | 41 - .../sca/test/corba/types/ScenarioFourImpl.java | 44 - .../sca/test/corba/types/ScenarioFourStruct.java | 40 - .../sca/test/corba/types/ScenarioOneComponent.java | 46 - .../sca/test/corba/types/ScenarioOneServant.java | 45 - .../sca/test/corba/types/ScenarioSixServant.java | 46 - .../sca/test/corba/types/ScenarioTwoServant.java | 42 - .../sca/test/corba/types/TAnnotatedStruct.java | 40 - .../tuscany/sca/test/corba/types/TColor.java | 62 - .../tuscany/sca/test/corba/types/TInnerStruct.java | 42 - .../tuscany/sca/test/corba/types/TInnerUnion.java | 59 - .../tuscany/sca/test/corba/types/TRichStruct.java | 42 - .../tuscany/sca/test/corba/types/TRichUnion.java | 95 -- .../tuscany/sca/test/corba/types/TScenarioOne.java | 33 - .../test/corba/types/TScenarioOneComponent.java | 43 - .../sca/test/corba/types/TScenarioOneServant.java | 44 - .../tuscany/sca/test/corba/types/TScenarioSix.java | 37 - .../test/corba/types/TScenarioSixComponent.java | 41 - .../sca/test/corba/types/TScenarioSixServant.java | 42 - .../sca/test/corba/types/TScenarioThree.java | 42 - .../test/corba/types/TScenarioThreeComponent.java | 41 - .../test/corba/types/TScenarioThreeServant.java | 52 - .../tuscany/sca/test/corba/types/TScenarioTwo.java | 32 - .../test/corba/types/TScenarioTwoComponent.java | 41 - .../sca/test/corba/types/TScenarioTwoServant.java | 38 - .../org.apache.tuscany.sca.core.ModuleActivator | 18 - .../src/test/resources/ScenarioFive.composite | 41 - .../src/test/resources/ScenarioFour.composite | 56 - .../corba/src/test/resources/ScenarioOne.composite | 111 -- .../corba/src/test/resources/ScenarioSix.composite | 41 - .../src/test/resources/ScenarioThree.composite | 43 - .../corba/src/test/resources/ScenarioTwo.composite | 43 - .../corba/src/test/resources/itest_scenario.idl | 110 -- .../corba/src/test/resources/scenariofour.xsd | 31 - .../sca/1.5.1/itest/databindings/common/pom.xml | 126 -- .../tuscany/sca/itest/generate/Generate.java | 181 --- .../resources/generate/DatabindingTestCase.java.vm | 112 -- .../src/main/resources/generate/Greeter.wsdl.vm | 103 -- .../main/resources/generate/GreeterService.java.vm | 53 - .../generate/GreeterServiceClient.java.vm | 42 - .../generate/GreeterServiceClientImpl.java.vm | 65 - .../resources/generate/GreeterServiceImpl.java.vm | 55 - .../src/main/resources/generate/generate.xsd | 61 - .../common/src/main/resources/wsdl/Dummy.txt | 4 - .../common/src/main/resources/xsd/Annotation.xml | 24 - .../common/src/main/resources/xsd/Annotation.xsd | 38 - .../common/src/main/resources/xsd/Attribute.xml | 24 - .../common/src/main/resources/xsd/Attribute.xsd | 39 - .../src/main/resources/xsd/AttributeReference.xml | 24 - .../src/main/resources/xsd/AttributeReference.xsd | 40 - .../resources/xsd/AttributeWithDefaultValue.xml | 24 - .../resources/xsd/AttributeWithDefaultValue.xsd | 38 - .../main/resources/xsd/AttributeWithFixedValue.xml | 24 - .../main/resources/xsd/AttributeWithFixedValue.xsd | 38 - .../resources/xsd/AttributeWithSDOAliasName.xml | 24 - .../resources/xsd/AttributeWithSDOAliasName.xsd | 38 - .../resources/xsd/AttributeWithSDODataType.xml | 24 - .../resources/xsd/AttributeWithSDODataType.xsd | 38 - .../main/resources/xsd/AttributeWithSDOName.xml | 24 - .../main/resources/xsd/AttributeWithSDOName.xsd | 38 - ...ibuteWithSDOPropertySDOOppositePropertyType.xml | 24 - ...ibuteWithSDOPropertySDOOppositePropertyType.xsd | 38 - .../resources/xsd/AttributeWithSDOPropertyType.xml | 24 - .../resources/xsd/AttributeWithSDOPropertyType.xsd | 38 - .../main/resources/xsd/AttributeWithSDOString.xml | 24 - .../main/resources/xsd/AttributeWithSDOString.xsd | 38 - .../main/resources/xsd/BuiltInAnySimpleType.xml | 24 - .../main/resources/xsd/BuiltInAnySimpleType.xsd | 31 - .../src/main/resources/xsd/BuiltInAnyType.xml | 24 - .../src/main/resources/xsd/BuiltInAnyType.xsd | 31 - .../src/main/resources/xsd/BuiltInAnyURI.xml | 24 - .../src/main/resources/xsd/BuiltInAnyURI.xsd | 31 - .../src/main/resources/xsd/BuiltInBase64Binary.xml | 24 - .../src/main/resources/xsd/BuiltInBase64Binary.xsd | 31 - .../src/main/resources/xsd/BuiltInBoolean.xml | 27 - .../src/main/resources/xsd/BuiltInBoolean.xsd | 31 - .../common/src/main/resources/xsd/BuiltInByte.xml | 25 - .../common/src/main/resources/xsd/BuiltInByte.xsd | 31 - .../common/src/main/resources/xsd/BuiltInDate.xml | 24 - .../common/src/main/resources/xsd/BuiltInDate.xsd | 31 - .../src/main/resources/xsd/BuiltInDateTime.xml | 24 - .../src/main/resources/xsd/BuiltInDateTime.xsd | 31 - .../src/main/resources/xsd/BuiltInDecimal.xml | 23 - .../src/main/resources/xsd/BuiltInDecimal.xsd | 31 - .../src/main/resources/xsd/BuiltInDouble.xml | 25 - .../src/main/resources/xsd/BuiltInDouble.xsd | 31 - .../src/main/resources/xsd/BuiltInDuration.xml | 24 - .../src/main/resources/xsd/BuiltInDuration.xsd | 31 - .../common/src/main/resources/xsd/BuiltInFloat.xml | 24 - .../common/src/main/resources/xsd/BuiltInFloat.xsd | 31 - .../common/src/main/resources/xsd/BuiltInGDay.xml | 24 - .../common/src/main/resources/xsd/BuiltInGDay.xsd | 31 - .../src/main/resources/xsd/BuiltInGMonth.xml | 24 - .../src/main/resources/xsd/BuiltInGMonth.xsd | 31 - .../src/main/resources/xsd/BuiltInGMonthDay.xml | 24 - .../src/main/resources/xsd/BuiltInGMonthDay.xsd | 31 - .../common/src/main/resources/xsd/BuiltInGYear.xml | 24 - .../common/src/main/resources/xsd/BuiltInGYear.xsd | 31 - .../src/main/resources/xsd/BuiltInGYearMonth.xml | 24 - .../src/main/resources/xsd/BuiltInGYearMonth.xsd | 31 - .../src/main/resources/xsd/BuiltInHexBinary.xml | 24 - .../src/main/resources/xsd/BuiltInHexBinary.xsd | 31 - .../common/src/main/resources/xsd/BuiltInID.xml | 24 - .../common/src/main/resources/xsd/BuiltInID.xsd | 31 - .../common/src/main/resources/xsd/BuiltInIDREF.xml | 24 - .../common/src/main/resources/xsd/BuiltInIDREF.xsd | 31 - .../src/main/resources/xsd/BuiltInIDREFS.xml | 24 - .../src/main/resources/xsd/BuiltInIDREFS.xsd | 31 - .../common/src/main/resources/xsd/BuiltInInt.xml | 25 - .../common/src/main/resources/xsd/BuiltInInt.xsd | 31 - .../src/main/resources/xsd/BuiltInInteger.xml | 25 - .../src/main/resources/xsd/BuiltInInteger.xsd | 31 - .../src/main/resources/xsd/BuiltInLanguage.xml | 24 - .../src/main/resources/xsd/BuiltInLanguage.xsd | 31 - .../common/src/main/resources/xsd/BuiltInLong.xml | 25 - .../common/src/main/resources/xsd/BuiltInLong.xsd | 33 - .../src/main/resources/xsd/BuiltInNCName.xml | 24 - .../src/main/resources/xsd/BuiltInNCName.xsd | 31 - .../src/main/resources/xsd/BuiltInNMTOKEN.xml | 24 - .../src/main/resources/xsd/BuiltInNMTOKEN.xsd | 31 - .../src/main/resources/xsd/BuiltInNMTOKENS.xml | 24 - .../src/main/resources/xsd/BuiltInNMTOKENS.xsd | 31 - .../src/main/resources/xsd/BuiltInNOTATION.xml | 24 - .../src/main/resources/xsd/BuiltInNOTATION.xsd | 39 - .../common/src/main/resources/xsd/BuiltInName.xml | 24 - .../common/src/main/resources/xsd/BuiltInName.xsd | 31 - .../main/resources/xsd/BuiltInNegativeInteger.xml | 24 - .../main/resources/xsd/BuiltInNegativeInteger.xsd | 31 - .../resources/xsd/BuiltInNonNegativeInteger.xml | 24 - .../resources/xsd/BuiltInNonNegativeInteger.xsd | 31 - .../resources/xsd/BuiltInNonPositiveInteger.xml | 24 - .../resources/xsd/BuiltInNonPositiveInteger.xsd | 31 - .../main/resources/xsd/BuiltInNormalizedString.xml | 24 - .../main/resources/xsd/BuiltInNormalizedString.xsd | 31 - .../main/resources/xsd/BuiltInPositiveInteger.xml | 24 - .../main/resources/xsd/BuiltInPositiveInteger.xsd | 31 - .../common/src/main/resources/xsd/BuiltInQName.xml | 24 - .../common/src/main/resources/xsd/BuiltInQName.xsd | 31 - .../common/src/main/resources/xsd/BuiltInShort.xml | 25 - .../common/src/main/resources/xsd/BuiltInShort.xsd | 31 - .../src/main/resources/xsd/BuiltInString.xml | 24 - .../src/main/resources/xsd/BuiltInString.xsd | 31 - .../common/src/main/resources/xsd/BuiltInTime.xml | 24 - .../common/src/main/resources/xsd/BuiltInTime.xsd | 31 - .../common/src/main/resources/xsd/BuiltInToken.xml | 24 - .../common/src/main/resources/xsd/BuiltInToken.xsd | 31 - .../src/main/resources/xsd/BuiltInUnsignedByte.xml | 25 - .../src/main/resources/xsd/BuiltInUnsignedByte.xsd | 31 - .../src/main/resources/xsd/BuiltInUnsignedInt.xml | 25 - .../src/main/resources/xsd/BuiltInUnsignedInt.xsd | 31 - .../src/main/resources/xsd/BuiltInUnsignedLong.xml | 25 - .../src/main/resources/xsd/BuiltInUnsignedLong.xsd | 31 - .../main/resources/xsd/BuiltInUnsignedShort.xml | 25 - .../main/resources/xsd/BuiltInUnsignedShort.xsd | 31 - ...lexTypeComplexContentRestrictingComplexType.xml | 26 - ...lexTypeComplexContentRestrictingComplexType.xsd | 44 - .../xsd/ComplexTypeExtendingComplexType.xml | 27 - .../xsd/ComplexTypeExtendingComplexType.xsd | 43 - .../xsd/ComplexTypeExtendingSimpleType.xml | 24 - .../xsd/ComplexTypeExtendingSimpleType.xsd | 41 - ...plexTypeSimpleContentRestrictingComplexType.xml | 24 - ...plexTypeSimpleContentRestrictingComplexType.xsd | 41 - .../main/resources/xsd/ComplexTypeWithAbstract.xml | 27 - .../main/resources/xsd/ComplexTypeWithAbstract.xsd | 47 - .../main/resources/xsd/ComplexTypeWithCDATA.xml | 30 - .../main/resources/xsd/ComplexTypeWithCDATA.xsd | 39 - .../main/resources/xsd/ComplexTypeWithContent.xml | 26 - .../main/resources/xsd/ComplexTypeWithContent.xsd | 37 - .../main/resources/xsd/ComplexTypeWithMixed.xml | 29 - .../main/resources/xsd/ComplexTypeWithMixed.xsd | 39 - .../xsd/ComplexTypeWithOpenAttributes.xml | 24 - .../xsd/ComplexTypeWithOpenAttributes.xsd | 42 - .../resources/xsd/ComplexTypeWithOpenContent.xml | 31 - .../resources/xsd/ComplexTypeWithOpenContent.xsd | 39 - .../xsd/ComplexTypeWithOppositeProperty.xml | 30 - .../xsd/ComplexTypeWithOppositeProperty.xsd | 59 - .../resources/xsd/ComplexTypeWithSDOAliasName.xml | 26 - .../resources/xsd/ComplexTypeWithSDOAliasName.xsd | 38 - .../main/resources/xsd/ComplexTypeWithSDOName.xml | 26 - .../main/resources/xsd/ComplexTypeWithSDOName.xsd | 38 - .../resources/xsd/ComplexTypeWithSDOSequence.xml | 26 - .../resources/xsd/ComplexTypeWithSDOSequence.xsd | 40 - .../resources/xsd/ComplexTypeWithoutContent.xml | 24 - .../resources/xsd/ComplexTypeWithoutContent.xsd | 33 - .../main/resources/xsd/ComplexTypeWithoutName.xml | 26 - .../main/resources/xsd/ComplexTypeWithoutName.xsd | 39 - .../src/main/resources/xsd/DefaultNamespace.xml | 23 - .../src/main/resources/xsd/DefaultNamespace.xsd | 32 - .../common/src/main/resources/xsd/ElementInAll.xml | 27 - .../common/src/main/resources/xsd/ElementInAll.xsd | 40 - .../src/main/resources/xsd/ElementInChoice.xml | 25 - .../src/main/resources/xsd/ElementInChoice.xsd | 48 - .../xsd/ElementOfSDOChangeSummaryType.xml | 29 - .../xsd/ElementOfSDOChangeSummaryType.xsd | 34 - .../xsd/ElementOfSimpleTypeWithDefault.xml | 24 - .../xsd/ElementOfSimpleTypeWithDefault.xsd | 31 - .../resources/xsd/ElementOfSimpleTypeWithFixed.xml | 24 - .../resources/xsd/ElementOfSimpleTypeWithFixed.xsd | 31 - .../xsd/ElementOfSimpleTypeWithSDODataType.xml | 24 - .../xsd/ElementOfSimpleTypeWithSDODataType.xsd | 33 - ...mentOfSimpleTypeWithSDOOppositePropertyType.xml | 24 - ...mentOfSimpleTypeWithSDOOppositePropertyType.xsd | 33 - .../xsd/ElementOfSimpleTypeWithSDOPropertyType.xml | 24 - .../xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd | 32 - .../xsd/ElementOfSimpleTypeWithSDOString.xml | 24 - .../xsd/ElementOfSimpleTypeWithSDOString.xsd | 32 - .../resources/xsd/ElementSubstitutionGroupBase.xml | 40 - .../resources/xsd/ElementSubstitutionGroupBase.xsd | 52 - .../main/resources/xsd/ElementWithMaxOccurs.xml | 25 - .../main/resources/xsd/ElementWithMaxOccurs.xsd | 31 - .../src/main/resources/xsd/ElementWithNillable.xml | 24 - .../src/main/resources/xsd/ElementWithNillable.xsd | 31 - .../main/resources/xsd/ElementWithSDOAliasName.xml | 24 - .../main/resources/xsd/ElementWithSDOAliasName.xsd | 32 - .../src/main/resources/xsd/ElementWithSDOName.xml | 24 - .../src/main/resources/xsd/ElementWithSDOName.xsd | 32 - .../resources/xsd/GlobalElementComplexType.xml | 24 - .../resources/xsd/GlobalElementComplexType.xsd | 31 - .../main/resources/xsd/GlobalElementSimpleType.xml | 24 - .../main/resources/xsd/GlobalElementSimpleType.xsd | 26 - .../common/src/main/resources/xsd/Import.xml | 30 - .../common/src/main/resources/xsd/Import.xsd | 40 - .../src/main/resources/xsd/ImportedSchema.xsd | 33 - .../common/src/main/resources/xsd/Include.xml | 24 - .../common/src/main/resources/xsd/Include.xsd | 36 - .../common/src/main/resources/xsd/Interop.xsd | 138 -- .../common/src/main/resources/xsd/Notation.xml | 24 - .../common/src/main/resources/xsd/Notation.xsd | 35 - .../common/src/main/resources/xsd/Person.xsd | 30 - .../src/main/resources/xsd/SDOJavaPackage.xml | 25 - .../src/main/resources/xsd/SDOJavaPackage.xsd | 39 - .../main/resources/xsd/SimpleTypeWithAbstract.xml | 24 - .../main/resources/xsd/SimpleTypeWithAbstract.xsd | 40 - .../xsd/SimpleTypeWithExtendedInstanceClass.xml | 24 - .../xsd/SimpleTypeWithExtendedInstanceClass.xsd | 36 - .../resources/xsd/SimpleTypeWithInstanceClass.xml | 24 - .../resources/xsd/SimpleTypeWithInstanceClass.xsd | 37 - .../src/main/resources/xsd/SimpleTypeWithList.xml | 24 - .../src/main/resources/xsd/SimpleTypeWithList.xsd | 37 - .../src/main/resources/xsd/SimpleTypeWithName.xml | 24 - .../src/main/resources/xsd/SimpleTypeWithName.xsd | 36 - .../main/resources/xsd/SimpleTypeWithSDOName.xml | 24 - .../main/resources/xsd/SimpleTypeWithSDOName.xsd | 37 - .../src/main/resources/xsd/SimpleTypeWithUnion.xml | 25 - .../src/main/resources/xsd/SimpleTypeWithUnion.xsd | 46 - .../main/resources/xsd/SimpleTypeWithoutName.xml | 26 - .../main/resources/xsd/SimpleTypeWithoutName.xsd | 38 - .../src/main/resources/xsd/TargetNamespace.xml | 24 - .../src/main/resources/xsd/TargetNamespace.xsd | 34 - .../common/src/main/resources/xsd/datagraph.xsd | 88 -- .../common/src/main/resources/xsd/sdoJava.xsd | 88 -- .../common/src/main/resources/xsd/sdoModel.xsd | 221 --- .../sca/itest/generate/GenerateTestCase.java | 49 - tags/java/sca/1.5.1/itest/databindings/config.png | Bin 31222 -> 0 bytes tags/java/sca/1.5.1/itest/databindings/config.svg | 117 -- .../sca/1.5.1/itest/databindings/databinding.png | Bin 14106 -> 0 bytes .../sca/1.5.1/itest/databindings/databinding.svg | 242 ---- tags/java/sca/1.5.1/itest/databindings/interop.png | Bin 23179 -> 0 bytes tags/java/sca/1.5.1/itest/databindings/interop.svg | 352 ----- .../sca/1.5.1/itest/databindings/interop/pom.xml | 223 --- .../generate/InteropDatabindingTestCase.java.vm | 113 -- .../main/resources/generate/JAXBGreeter.wsdl.vm | 103 -- .../src/main/resources/generate/SDOGreeter.wsdl.vm | 103 -- .../src/main/resources/generate/generate.xml | 159 --- .../resources/generate/interopgreeter.composite.vm | 78 -- .../itest/databindings/jaxb-bottom-up/pom.xml | 239 ---- .../itest/databindings/jaxb/AClientService.java | 29 - .../sca/itest/databindings/jaxb/AService.java | 32 - .../tuscany/sca/itest/databindings/jaxb/Bean1.java | 63 - .../sca/itest/databindings/jaxb/Bean10.java | 25 - .../sca/itest/databindings/jaxb/Bean11.java | 25 - .../tuscany/sca/itest/databindings/jaxb/Bean2.java | 56 - .../tuscany/sca/itest/databindings/jaxb/Bean3.java | 56 - .../sca/itest/databindings/jaxb/Bean31.java | 56 - .../databindings/jaxb/GenericsLocalService.java | 42 - .../itest/databindings/jaxb/GenericsService.java | 30 - .../databindings/jaxb/GenericsServiceClient.java | 43 - .../databindings/jaxb/HelloLocalServiceSimple.java | 37 - .../databindings/jaxb/HelloServiceSimple.java | 29 - .../jaxb/HelloServiceSimpleClient.java | 38 - .../databindings/jaxb/PrimitivesLocalService.java | 47 - .../itest/databindings/jaxb/PrimitivesService.java | 29 - .../databindings/jaxb/PrimitivesServiceClient.java | 48 - .../jaxb/StandardTypesLocalService.java | 78 -- .../databindings/jaxb/StandardTypesService.java | 30 - .../jaxb/StandardTypesServiceClient.java | 79 -- .../databindings/jaxb/impl/AClientServiceImpl.java | 38 - .../itest/databindings/jaxb/impl/AServiceImpl.java | 33 - .../jaxb/impl/GenericsLocalServiceClientImpl.java | 77 -- .../jaxb/impl/GenericsServiceClientImpl.java | 40 - .../jaxb/impl/GenericsServiceImpl.java | 69 - .../jaxb/impl/GenericsTransformer.java | 125 -- .../impl/HelloLocalServiceSimpleClientImpl.java | 73 - .../jaxb/impl/HelloServiceSimpleClientImpl.java | 38 - .../jaxb/impl/HelloServiceSimpleImpl.java | 86 -- .../impl/PrimitivesLocalServiceClientImpl.java | 138 -- .../jaxb/impl/PrimitivesServiceClientImpl.java | 38 - .../jaxb/impl/PrimitivesServiceImpl.java | 151 -- .../impl/StandardTypesLocalServiceClientImpl.java | 157 --- .../jaxb/impl/StandardTypesServiceClientImpl.java | 38 - .../jaxb/impl/StandardTypesServiceImpl.java | 208 --- .../jaxb/impl/StandardTypesTransformer.java | 144 -- .../src/main/resources/aservice.wsdl | 127 -- .../src/main/resources/doclitbarewsdl.composite | 37 - .../src/main/resources/generics-service.composite | 69 - .../src/main/resources/helloservice.composite | 65 - .../src/main/resources/primitivesservice.composite | 66 - .../resources/standard-types-service.composite | 66 - .../databindings/jaxb/DatabindingTestCase.java | 339 ----- .../databindings/jaxb/DocLitBareWsdlTestCase.java | 67 - .../jaxb/GenericsDatabindingTestCase.java | 484 ------- .../jaxb/PrimitivesDatabindingTestCase.java | 776 ----------- .../jaxb/StandardTypesDatabindingTestCase.java | 1439 ------------------- .../1.5.1/itest/databindings/jaxb-top-down/pom.xml | 194 --- .../sca/itest/databindings/jaxb/HelloService.java | 42 - .../databindings/jaxb/HelloServiceClient.java | 41 - .../itest/databindings/jaxb/PrimitivesService.java | 51 - .../databindings/jaxb/PrimitivesServiceClient.java | 50 - .../databindings/jaxb/StandardTypesService.java | 84 -- .../jaxb/StandardTypesServiceClient.java | 81 -- .../jaxb/impl/HelloServiceClientImpl.java | 73 - .../databindings/jaxb/impl/HelloServiceImpl.java | 86 -- .../jaxb/impl/PrimitivesServiceClientImpl.java | 139 -- .../jaxb/impl/PrimitivesServiceImpl.java | 151 -- .../jaxb/impl/StandardTypesServiceClientImpl.java | 159 --- .../jaxb/impl/StandardTypesServiceImpl.java | 207 --- .../jaxb/impl/StandardTypesTransformer.java | 142 -- .../main/resources/wsdl/wrapped/hello-service.wsdl | 371 ----- .../resources/wsdl/wrapped/helloservice.composite | 80 -- .../resources/wsdl/wrapped/primitives-service.wsdl | 927 ------------- .../wsdl/wrapped/primitivesservice.composite | 80 -- .../wsdl/wrapped/standard-types-service.composite | 80 -- .../wsdl/wrapped/standard-types-service.wsdl | 1155 ---------------- .../jaxb/topdown/DatabindingTestCase.java | 347 ----- .../topdown/PrimitivesDatabindingTestCase.java | 849 ------------ .../topdown/StandardTypesDatabindingTestCase.java | 1446 -------------------- .../sca/1.5.1/itest/databindings/jaxbgen/pom.xml | 262 ---- .../src/main/resources/generate/generate.xml | 172 --- .../jaxbgen/src/main/resources/greeter.composite | 49 - tags/java/sca/1.5.1/itest/databindings/pom.xml | 47 - tags/java/sca/1.5.1/itest/databindings/readme.html | 157 --- .../sca/1.5.1/itest/databindings/sdogen/pom.xml | 251 ---- .../src/main/resources/generate/generate.xml | 170 --- .../main/resources/generate/greeter.composite.vm | 56 - .../sca/1.5.1/itest/distro-license-check/pom.xml | 51 - .../src/test/java/itest/LicenseTestCase.java | 160 --- tags/java/sca/1.5.1/itest/domain/pom.xml | 100 -- .../src/main/java/calculator/AddService.java | 31 - .../src/main/java/calculator/AddServiceImpl.java | 31 - .../main/java/calculator/AddServiceUpdateImpl.java | 31 - .../main/java/calculator/CalculatorService.java | 38 - .../java/calculator/CalculatorServiceImpl.java | 74 - .../src/main/java/calculator/DivideService.java | 28 - .../main/java/calculator/DivideServiceImpl.java | 30 - .../src/main/java/calculator/MultiplyService.java | 28 - .../main/java/calculator/MultiplyServiceImpl.java | 30 - .../src/main/java/calculator/SubtractService.java | 31 - .../main/java/calculator/SubtractServiceImpl.java | 31 - .../resources/contributionA/Calculator.composite | 44 - .../contributionA/META-INF/sca-contribution.xml | 24 - .../META-INF/sca-deployables/Calculator.composite | 45 - .../META-INF/sca-deployables/Calculator.composite | 32 - .../contributionDependent/Calculator.composite | 36 - .../META-INF/sca-contribution.xml | 24 - .../contributionPrimary/Calculator.composite | 57 - .../META-INF/sca-contribution.xml | 25 - .../sca/itest/domain/ContributionSPIsTestCase.java | 279 ---- .../sca/1.5.1/itest/domainmgr/basic/client/pom.xml | 48 - .../src/main/java/scatours/client/TestClient.java | 47 - .../main/resources/META-INF/sca-contribution.xml | 25 - .../client/src/main/resources/client.composite | 29 - tags/java/sca/1.5.1/itest/domainmgr/basic/pom.xml | 42 - .../1.5.1/itest/domainmgr/basic/runtest/pom.xml | 104 -- .../java/domainmgr/DomainManagerBasicTestCase.java | 345 ----- .../src/test/resources/domain/cloud.composite | 15 - .../resources/domain/cloud/ClientNode.composite | 13 - .../resources/domain/cloud/ToursNode.composite | 13 - .../resources/domain/cloud/TripsNode.composite | 13 - .../src/test/resources/domain/domain.composite | 15 - .../src/test/resources/domain/workspace.xml | 12 - .../sca/1.5.1/itest/domainmgr/basic/tours/pom.xml | 42 - .../src/main/java/com/goodvaluetrips/Trips.java | 26 - .../main/java/com/tuscanyscatours/Bookings.java | 26 - .../main/java/com/tuscanyscatours/Checkout.java | 28 - .../java/com/tuscanyscatours/ShoppingCart.java | 40 - .../main/java/com/tuscanyscatours/TripBooking.java | 35 - .../src/main/java/com/tuscanyscatours/Updates.java | 26 - .../main/resources/META-INF/sca-contribution.xml | 25 - .../basic/tours/src/main/resources/tours.composite | 46 - .../sca/1.5.1/itest/domainmgr/basic/trips/pom.xml | 42 - .../main/java/com/goodvaluetrips/TripProvider.java | 26 - .../src/main/java/com/goodvaluetrips/Trips.java | 26 - .../main/resources/META-INF/sca-contribution.xml | 24 - .../basic/trips/src/main/resources/trips.composite | 30 - .../1.5.1/itest/domainmgr/callback/client/pom.xml | 51 - .../src/main/java/callbackclient/MyClientImpl.java | 52 - .../src/main/java/callbackclient/MyService.java | 34 - .../java/callbackclient/MyServiceCallback.java | 30 - .../src/main/java/callbackclient/TestService.java | 29 - .../main/resources/META-INF/sca-contribution.xml | 23 - .../client/src/main/resources/client.composite | 29 - .../sca/1.5.1/itest/domainmgr/callback/pom.xml | 41 - .../1.5.1/itest/domainmgr/callback/runtest/pom.xml | 97 -- .../src/test/java/callbacktest/TestService.java | 29 - .../domainmgr/DomainManagerCallbackTestCase.java | 358 ----- .../src/test/resources/domain/cloud.composite | 12 - .../resources/domain/cloud/ClientNode.composite | 13 - .../resources/domain/cloud/ServiceNode.composite | 13 - .../src/test/resources/domain/domain.composite | 12 - .../src/test/resources/domain/workspace.xml | 10 - .../1.5.1/itest/domainmgr/callback/service/pom.xml | 51 - .../src/main/java/callbackservice/MyService.java | 34 - .../java/callbackservice/MyServiceCallback.java | 30 - .../main/java/callbackservice/MyServiceImpl.java | 50 - .../main/resources/META-INF/sca-contribution.xml | 23 - .../service/src/main/resources/service.composite | 28 - .../1.5.1/itest/domainmgr/error/payment/pom.xml | 142 -- .../payment/src/main/java/payment/PaymentImpl.java | 88 -- .../src/main/java/scatours/customer/Customer.java | 70 - .../customer/CustomerNotFoundException.java | 58 - .../java/scatours/customer/CustomerRegistry.java | 39 - .../scatours/customer/CustomerRegistryImpl.java | 112 -- .../java/scatours/emailgateway/EmailGateway.java | 30 - .../scatours/emailgateway/EmailGatewayImpl.java | 35 - .../src/main/resources/CreditCardPayment.wsdl | 132 -- .../main/resources/META-INF/sca-contribution.xml | 24 - .../error/payment/src/main/resources/Payment.wsdl | 83 -- .../payment/src/main/resources/payment.composite | 47 - tags/java/sca/1.5.1/itest/domainmgr/error/pom.xml | 40 - .../1.5.1/itest/domainmgr/error/runtest/pom.xml | 104 -- .../java/domainmgr/DomainManagerErrorTestCase.java | 342 ----- .../src/test/resources/domain/cloud.composite | 9 - .../resources/domain/cloud/PaymentNode.composite | 13 - .../src/test/resources/domain/domain.composite | 9 - .../src/test/resources/domain/workspace.xml | 8 - tags/java/sca/1.5.1/itest/domainmgr/pom.xml | 44 - .../itest/domainmgr/transaction/payment/pom.xml | 142 -- .../payment/src/main/java/payment/PaymentImpl.java | 88 -- .../src/main/java/scatours/customer/Customer.java | 70 - .../customer/CustomerNotFoundException.java | 58 - .../java/scatours/customer/CustomerRegistry.java | 39 - .../scatours/customer/CustomerRegistryImpl.java | 112 -- .../java/scatours/emailgateway/EmailGateway.java | 30 - .../scatours/emailgateway/EmailGatewayImpl.java | 35 - .../src/main/resources/CreditCardPayment.wsdl | 132 -- .../main/resources/META-INF/sca-contribution.xml | 24 - .../payment/src/main/resources/Payment.wsdl | 83 -- .../payment/src/main/resources/definitions.xml | 35 - .../payment/src/main/resources/payment.composite | 47 - .../sca/1.5.1/itest/domainmgr/transaction/pom.xml | 40 - .../itest/domainmgr/transaction/runtest/pom.xml | 104 -- .../DomainManagerTransactionTestCase.java | 328 ----- .../src/test/resources/domain/cloud.composite | 9 - .../resources/domain/cloud/PaymentNode.composite | 13 - .../src/test/resources/domain/domain.composite | 9 - .../src/test/resources/domain/workspace.xml | 8 - .../itest/exceptions-cross-binding-ws/pom.xml | 243 ---- .../test/exceptions/impl/StockExchangeJaxB.java | 71 - .../sca/test/exceptions/impl/StockTraderSDO.java | 39 - .../test/exceptions/impl/StockTraderSDOImpl.java | 136 -- .../sdohandgen/InvalidSymbolSDOException.java | 84 -- .../sdohandgen/MarketClosedSDOException.java | 76 - .../exceptions/sdohandgen/StockExceptionTest.java | 45 - .../src/main/resources/ExceptionTest.composite | 23 - .../src/main/resources/intracomposite.composite | 42 - .../main/resources/wsdl/StockExceptionTest.wsdl | 148 -- .../src/main/resources/xsd/StockExceptionTest.xsd | 65 - .../test/exceptions/IntraCompositeTestCase.java | 102 -- .../1.5.1/itest/exceptions-cross-binding/pom.xml | 234 ---- .../exceptions/impl/StockExceptionTestJAXB.java | 31 - .../test/exceptions/impl/StockExchangeJaxB.java | 76 - .../sca/test/exceptions/impl/StockTraderSDO.java | 37 - .../test/exceptions/impl/StockTraderSDOImpl.java | 119 -- .../sdohandgen/InvalidSymbolSDOException.java | 84 -- .../sdohandgen/MarketClosedSDOException.java | 75 - .../exceptions/sdohandgen/StockExceptionTest.java | 45 - .../src/main/resources/ExceptionTest.composite | 25 - .../src/main/resources/intracomposite.composite | 35 - .../resources/wsdl.sdo/StockExceptionTest.wsdl | 141 -- .../main/resources/wsdl/StockExceptionTest.wsdl | 148 -- .../src/main/resources/xsd/StockExceptionTest.xsd | 65 - .../test/exceptions/IntraCompositeTestCase.java | 93 -- .../sca/1.5.1/itest/exceptions-simple-ws/pom.xml | 59 - .../main/java/com/example/BusinessException.java | 43 - .../java/com/example/BusinessExceptionMinimal.java | 28 - .../src/main/java/com/example/ExampleClient.java | 23 - .../main/java/com/example/ExampleClientImpl.java | 51 - .../java/com/example/ExampleClientMinimalImpl.java | 54 - .../src/main/java/com/example/ExampleService.java | 28 - .../main/java/com/example/ExampleServiceImpl.java | 32 - .../java/com/example/ExampleServiceMinimal.java | 28 - .../com/example/ExampleServiceMinimalImpl.java | 30 - .../src/main/resources/example.composite | 56 - .../src/main/resources/wsdl/ExampleService.wsdl | 157 --- .../java/com/example/ExampleMinimalTestCase.java | 44 - .../src/test/java/com/example/ExampleTestCase.java | 44 - tags/java/sca/1.5.1/itest/exceptions/pom.xml | 45 - .../tuscany/sca/test/exceptions/Checked.java | 58 - .../sca/test/exceptions/ExceptionHandler.java | 32 - .../test/exceptions/ExceptionRemoteThrower.java | 30 - .../sca/test/exceptions/ExceptionThrower.java | 38 - .../tuscany/sca/test/exceptions/UnChecked.java | 57 - .../test/exceptions/impl/ExceptionHandlerImpl.java | 115 -- .../impl/ExceptionRemoteThrowerImpl.java | 44 - .../test/exceptions/impl/ExceptionThrowerImpl.java | 45 - .../impl/RemoteExceptionHandlerImpl.java | 116 -- .../src/main/resources/ExceptionTest.composite | 41 - .../sca/test/exceptions/ExceptionsTestCase.java | 73 - tags/java/sca/1.5.1/itest/extended-api/pom.xml | 51 - .../tuscany/sca/test/extended/BasicService.java | 26 - .../tuscany/sca/test/extended/MathService.java | 25 - .../sca/test/extended/impl/BasicServiceImpl.java | 45 - .../sca/test/extended/impl/MathServiceImpl.java | 31 - .../src/main/resources/BasicService.composite | 29 - .../src/main/resources/MathService.composite | 29 - .../sca/test/extended/ServiceLocateTestCase.java | 73 - tags/java/sca/1.5.1/itest/http-jsonrpc/pom.xml | 108 -- .../http-jsonrpc/src/test/java/bean/TestBean.java | 50 - .../http-jsonrpc/src/test/java/echo/Echo.java | 65 - .../src/test/java/echo/EchoBusinessException.java | 29 - .../src/test/java/echo/EchoComponentImpl.java | 103 -- .../jsonrpc/JSONRPCDataTypeTestCase.java | 193 --- .../jsonrpc/JSONRPCExceptionTestCase.java | 86 -- .../wireformat/jsonrpc/JSONRPCServiceTestCase.java | 70 - .../wireformat/jsonrpc/JSONRPCSmdTestCase.java | 71 - .../wireformat/jsonrpc/JSONRPCBinding.composite | 38 - .../itest/implementation-jee-external-ear/pom.xml | 84 -- ...tuscany.sca.contribution.resolver.ModelResolver | 18 - ...cany.sca.provider.ImplementationProviderFactory | 19 - .../src/main/resources/test.composite | 31 - .../src/test/java/itest/Helloworld.java | 25 - .../src/test/java/itest/JeeTestCase.java | 52 - .../itest/MockImplementationProviderFactory.java | 44 - .../test/java/itest/SomeCustomModelResolver.java | 77 -- tags/java/sca/1.5.1/itest/interfaces/pom.xml | 46 - .../itest/interfaces/LocalCallbackInterface.java | 31 - .../sca/itest/interfaces/LocalClientComponent.java | 47 - .../itest/interfaces/LocalClientComponentImpl.java | 83 -- .../itest/interfaces/LocalServiceComponent.java | 37 - .../interfaces/LocalServiceComponentImpl.java | 49 - .../sca/itest/interfaces/ParameterObject.java | 47 - .../itest/interfaces/RemoteCallbackInterface.java | 33 - .../itest/interfaces/RemoteClientComponent.java | 63 - .../interfaces/RemoteClientComponentImpl.java | 81 -- .../itest/interfaces/RemoteServiceComponent.java | 38 - .../interfaces/RemoteServiceComponentImpl.java | 54 - .../src/main/resources/InterfacesTest.composite | 40 - .../sca/itest/interfaces/InterfacesTestCase.java | 126 -- .../sca/1.5.1/itest/interop-soap-client/pom.xml | 126 -- .../LoopbackInteropDocServiceComponentImpl.java | 46 - .../src/main/resources/default.composite | 35 - .../src/main/resources/wsdl/interopdoc.wsdl | 195 --- .../interop/client/InteropDocClientTestCase.java | 144 -- .../1.5.1/itest/interop-soap-round2-client/pom.xml | 124 -- .../test/interop/client/InteropTestDocLit.java | 44 - .../src/main/resources/default.composite | 38 - .../src/main/resources/wsdl/interoptestdoclit.wsdl | 155 --- .../interop/client/InteropTestDocLitTestCase.java | 133 -- .../sca/1.5.1/itest/interop-soap-service/pom.xml | 134 -- .../server/InteropDocServiceComponentImpl.java | 47 - .../src/main/resources/wsdl/interopdoc.wsdl | 180 --- .../src/main/webapp/META-INF/sca/default.scdl | 42 - .../src/main/webapp/WEB-INF/web.xml | 51 - .../sca/1.5.1/itest/interop-soap-service/t.bat | 34 - .../sca/1.5.1/itest/java-init-exceptions/pom.xml | 72 - .../src/main/java/itest/ConstructorException.java | 49 - .../java/itest/InitCompositeScopeException.java | 57 - .../main/java/itest/InitRequestScopeException.java | 57 - .../java/itest/InitStatelessScopeException.java | 57 - .../src/main/java/itest/OkImpl.java | 52 - .../src/main/java/itest/Service.java | 26 - .../src/main/resources/test.composite | 43 - .../src/test/java/itest/InitTestCase.java | 150 -- tags/java/sca/1.5.1/itest/jaxws/pom.xml | 125 -- .../tuscanyscatours/payment/impl/PaymentImpl.java | 35 - .../itest/jaxws/src/main/resources/Payment.wsdl | 83 -- .../jaxws/src/main/resources/payment.composite | 33 - .../java/scatours/payment/PaymentTestCase.java | 55 - tags/java/sca/1.5.1/itest/jms-args/pom.xml | 99 -- .../apache/tuscany/sca/binding/jms/ClientImpl.java | 41 - .../apache/tuscany/sca/binding/jms/MyService.java | 29 - .../tuscany/sca/binding/jms/ServiceImpl.java | 38 - .../jms-args/src/main/resources/jndi.properties | 38 - .../main/resources/selectors/selectors.composite | 39 - .../tuscany/sca/binding/jms/ArgsTestCase.java | 61 - tags/java/sca/1.5.1/itest/jms-callbacks/pom.xml | 100 -- .../apache/tuscany/sca/binding/jms/JMSClient.java | 28 - .../tuscany/sca/binding/jms/JMSClientImpl.java | 50 - .../apache/tuscany/sca/binding/jms/JMSService.java | 34 - .../sca/binding/jms/JMSServiceCallback.java | 32 - .../tuscany/sca/binding/jms/JMSServiceImpl.java | 47 - .../src/main/resources/jndi.properties | 39 - .../src/main/resources/simple/client.composite | 44 - .../src/main/resources/simple/tempq.composite | 50 - .../tuscany/sca/binding/jms/CallbackTestCase.java | 60 - .../sca/binding/jms/TempCallbackQTestCase.java | 63 - tags/java/sca/1.5.1/itest/jms-definitions/pom.xml | 99 -- .../tuscany/sca/binding/jms/OneWayClientImpl.java | 41 - .../tuscany/sca/binding/jms/OneWayService.java | 29 - .../tuscany/sca/binding/jms/OneWayServiceImpl.java | 34 - .../src/main/resources/definitions.xml | 28 - .../resources/definitions/definitions.composite | 39 - .../src/main/resources/jndi.properties | 38 - .../sca/binding/jms/DefinitionsTestCase.java | 61 - tags/java/sca/1.5.1/itest/jms-format/pom.xml | 102 -- .../jmsbytes/helloworld/CheckedException.java | 28 - .../jmsbytes/helloworld/HelloWorldReference.java | 32 - .../helloworld/HelloWorldReferenceImpl.java | 50 - .../jmsbytes/helloworld/HelloWorldService.java | 35 - .../jmsbytes/helloworld/HelloWorldServiceImpl.java | 40 - .../helloworld/HelloWorldServiceReference.java | 35 - .../jmsbytesxml/helloworld/CheckedException.java | 28 - .../helloworld/HelloWorldReference.java | 32 - .../helloworld/HelloWorldReferenceImpl.java | 46 - .../jmsbytesxml/helloworld/HelloWorldService.java | 34 - .../helloworld/HelloWorldServiceImpl.java | 39 - .../jmsdefault/helloworld/CheckedException.java | 28 - .../jmsdefault/helloworld/HelloWorldReference.java | 36 - .../helloworld/HelloWorldReferenceImpl.java | 85 -- .../jmsdefault/helloworld/HelloWorldService.java | 39 - .../helloworld/HelloWorldServiceImpl.java | 52 - .../jms/format/jmsdefault/helloworld/Person.java | 42 - .../jmsmessage/helloworld/HelloWorldReference.java | 32 - .../helloworld/HelloWorldReferenceImpl.java | 41 - .../jmsmessage/helloworld/HelloWorldService.java | 34 - .../helloworld/HelloWorldServiceImpl.java | 51 - .../helloworld/HelloWorldServiceReferenceSide.java | 37 - .../jms/format/jmsmessage/helloworld/README | 3 - .../jmsobject/helloworld/CheckedException.java | 28 - .../jmsobject/helloworld/HelloWorldReference.java | 32 - .../helloworld/HelloWorldReferenceImpl.java | 112 -- .../jmsobject/helloworld/HelloWorldService.java | 41 - .../helloworld/HelloWorldServiceImpl.java | 63 - .../jms/format/jmsobject/helloworld/Person.java | 47 - .../jmstext/helloworld/CheckedException.java | 28 - .../jmstext/helloworld/HelloWorldReference.java | 32 - .../helloworld/HelloWorldReferenceImpl.java | 46 - .../jmstext/helloworld/HelloWorldService.java | 35 - .../jmstext/helloworld/HelloWorldServiceImpl.java | 38 - .../helloworld/HelloWorldServiceReference.java | 35 - .../jmstextxml/helloworld/CheckedException.java | 28 - .../jmstextxml/helloworld/HelloWorldReference.java | 33 - .../helloworld/HelloWorldReferenceImpl.java | 62 - .../jmstextxml/helloworld/HelloWorldService.java | 36 - .../helloworld/HelloWorldServiceImpl.java | 45 - .../jms/format/jmstextxml/helloworld/Person.java | 42 - .../helloworld/HelloWorldReferenceImpl.java | 38 - .../helloworld/HelloWorldService.java | 33 - .../helloworld/HelloWorldServiceImpl.java | 35 - .../helloworld/Person.java | 42 - .../main/resources/META-INF/sca-contribution.xml | 23 - .../main/resources/jmsbytes/helloworld.composite | 45 - .../resources/jmsbytesxml/helloworld.composite | 45 - .../main/resources/jmsdefault/helloworld.composite | 94 -- .../src/main/resources/jmsdefault/helloworld.wsdl | 139 -- .../main/resources/jmsmessage/helloworld.composite | 46 - .../src/main/resources/jmsmessage/helloworld.wsdl | 129 -- .../main/resources/jmsobject/helloworld.composite | 62 - .../src/main/resources/jmsobject/helloworld.wsdl | 355 ----- .../main/resources/jmstext/helloworld.composite | 45 - .../main/resources/jmstextxml/helloworld.composite | 80 -- .../src/main/resources/jmstextxml/helloworld.wsdl | 139 -- .../jmstextxmlinjmsobjectout/helloworld.composite | 52 - .../jmstextxmlinjmsobjectout/helloworld.wsdl | 139 -- .../jms-format/src/main/resources/jndi.properties | 39 - .../binding/jms/format/FormatJMSBytesTestCase.java | 75 - .../jms/format/FormatJMSBytesXMLTestCase.java | 64 - .../jms/format/FormatJMSDefaultTestCase.java | 74 - .../jms/format/FormatJMSMessageTestCase.java | 64 - .../jms/format/FormatJMSObjectTestCase.java | 80 -- .../binding/jms/format/FormatJMSTextTestCase.java | 66 - .../FormatJMSTextXMLInJMSObjectOutTestCase.java | 69 - .../jms/format/FormatJMSTextXMLTestCase.java | 68 - .../itest/jms-nonscaclient-exceptions/pom.xml | 115 -- .../tuscany/sca/binding/jms/CheckedExcpetion.java | 28 - .../sca/binding/jms/CheckedExcpetion2Args.java | 28 - .../sca/binding/jms/CheckedExcpetionChained.java | 28 - .../sca/binding/jms/CheckedExcpetionNoArgs.java | 28 - .../tuscany/sca/binding/jms/ExceptionService.java | 33 - .../sca/binding/jms/ExceptionServiceImpl.java | 44 - .../main/resources/exceptions/service.composite | 43 - .../src/main/resources/jndi.properties | 40 - .../sca/binding/jms/ExceptionsTestCase.java | 211 --- tags/java/sca/1.5.1/itest/jms-noreplyto/pom.xml | 102 -- .../tuscany/sca/binding/jms/HelloWorldService.java | 26 - .../sca/binding/jms/HelloWorldServiceImpl.java | 30 - .../src/main/resources/jndi.properties | 39 - .../src/main/resources/service.composite | 37 - .../tuscany/sca/binding/jms/NoReplyToTestCase.java | 100 -- tags/java/sca/1.5.1/itest/jms-nulls/pom.xml | 99 -- .../apache/tuscany/sca/binding/jms/ClientImpl.java | 41 - .../apache/tuscany/sca/binding/jms/MyService.java | 28 - .../tuscany/sca/binding/jms/ServiceImpl.java | 28 - .../jms-nulls/src/main/resources/jndi.properties | 38 - .../jms-nulls/src/main/resources/nulls.composite | 58 - .../tuscany/sca/binding/jms/NullsTestCase.java | 59 - tags/java/sca/1.5.1/itest/jms-oneway-nocf/pom.xml | 109 -- .../tuscany/sca/binding/jms/OneWayClientImpl.java | 41 - .../tuscany/sca/binding/jms/OneWayService.java | 29 - .../tuscany/sca/binding/jms/OneWayServiceImpl.java | 34 - .../src/main/resources/jndi.properties | 38 - .../main/resources/oneway/OneWayClient.composite | 36 - .../main/resources/oneway/OneWayService.composite | 33 - .../tuscany/sca/binding/jms/OneWayTestCase.java | 58 - tags/java/sca/1.5.1/itest/jms-responsecf/pom.xml | 109 -- .../sca/binding/jms/HelloWorldClientImpl.java | 41 - .../tuscany/sca/binding/jms/HelloWorldService.java | 26 - .../sca/binding/jms/HelloWorldServiceImpl.java | 30 - .../src/main/resources/cf/client.composite | 38 - .../src/main/resources/cf/service.composite | 35 - .../src/main/resources/jndi.properties | 39 - .../sca/binding/jms/ResponseCFTestCase.java | 53 - tags/java/sca/1.5.1/itest/jms-selectors/pom.xml | 99 -- .../apache/tuscany/sca/binding/jms/ClientImpl.java | 41 - .../tuscany/sca/binding/jms/SelectorService.java | 29 - .../sca/binding/jms/SelectorServiceImpl1.java | 40 - .../sca/binding/jms/SelectorServiceImpl2.java | 38 - .../sca/binding/jms/SelectorServiceImpl3.java | 38 - .../jmsdefault/HelloWorldReference.java | 32 - .../jmsdefault/HelloWorldReferenceImpl.java | 39 - .../jmsdefault/HelloWorldService.java | 38 - .../jmsdefault/HelloWorldServiceImpl.java | 47 - .../jmsuserprop/HelloWorldReference.java | 32 - .../jmsuserprop/HelloWorldReferenceImpl.java | 36 - .../jmsuserprop/HelloWorldService.java | 38 - .../jmsuserprop/HelloWorldServiceImpl.java | 47 - .../main/resources/jmsdefault/helloworld.composite | 66 - .../resources/jmsuserprop/helloworld.composite | 62 - .../src/main/resources/jndi.properties | 38 - .../main/resources/selectors/selectors.composite | 68 - .../jms/OperationselectorJMSDefaultTestCase.java | 63 - .../jms/OperationselectorJMSUserPropTestCase.java | 63 - .../tuscany/sca/binding/jms/SelectorsTestCase.java | 75 - tags/java/sca/1.5.1/itest/jms-topics/pom.xml | 99 -- .../tuscany/sca/binding/jms/OneWayClientImpl.java | 41 - .../tuscany/sca/binding/jms/OneWayService.java | 29 - .../tuscany/sca/binding/jms/OneWayServiceImpl.java | 34 - .../jms-topics/src/main/resources/jndi.properties | 38 - .../main/resources/topics/TopicsClient.composite | 35 - .../main/resources/topics/TopicsService.composite | 32 - .../tuscany/sca/binding/jms/TopicsTestCase.java | 58 - tags/java/sca/1.5.1/itest/jms-ttl/pom.xml | 99 -- .../main/java/itest/MockInitialContextFactory.java | 904 ------------ .../tuscany/sca/binding/jms/ClientIface.java | 30 - .../apache/tuscany/sca/binding/jms/ClientImpl.java | 39 - .../jms-ttl/src/main/resources/jndi.properties | 38 - .../itest/jms-ttl/src/main/resources/ttl.composite | 36 - .../tuscany/sca/binding/jms/TTLTestCase.java | 63 - tags/java/sca/1.5.1/itest/jms/pom.xml | 109 -- .../tuscany/sca/binding/jms/CheckedExcpetion.java | 28 - .../sca/binding/jms/CheckedExcpetion2Args.java | 28 - .../sca/binding/jms/CheckedExcpetionChained.java | 28 - .../sca/binding/jms/CheckedExcpetionNoArgs.java | 28 - .../tuscany/sca/binding/jms/ExceptionService.java | 33 - .../sca/binding/jms/ExceptionServiceClient.java | 57 - .../sca/binding/jms/ExceptionServiceImpl.java | 44 - .../sca/binding/jms/HelloWorldClientImpl.java | 41 - .../tuscany/sca/binding/jms/HelloWorldService.java | 26 - .../sca/binding/jms/HelloWorldServiceImpl.java | 30 - .../apache/tuscany/sca/binding/jms/JMSClient.java | 28 - .../apache/tuscany/sca/binding/jms/MsgClient.java | 29 - .../tuscany/sca/binding/jms/MsgClientImpl.java | 38 - .../tuscany/sca/binding/jms/MsgClientService.java | 33 - .../apache/tuscany/sca/binding/jms/MsgService.java | 32 - .../tuscany/sca/binding/jms/MsgServiceImpl.java | 39 - .../tuscany/sca/binding/jms/OneWayClientImpl.java | 41 - .../sca/binding/jms/OneWayObjectService.java | 29 - .../sca/binding/jms/OneWayObjectServiceImpl.java | 34 - .../tuscany/sca/binding/jms/OneWayService.java | 29 - .../tuscany/sca/binding/jms/OneWayServiceImpl.java | 34 - .../sca/binding/jms/TestMessageProcessor.java | 57 - .../src/main/resources/defaults/client.composite | 33 - .../src/main/resources/defaults/service.composite | 30 - .../src/main/resources/dynamic/client.composite | 36 - .../src/main/resources/exceptions/client.composite | 33 - .../main/resources/exceptions/service.composite | 30 - .../src/main/resources/external/client.composite | 38 - .../src/main/resources/external/service.composite | 35 - .../itest/jms/src/main/resources/jndi.properties | 39 - .../main/resources/nonSCAclient/service.composite | 50 - .../main/resources/oneway/OneWayClient.composite | 35 - .../main/resources/oneway/OneWayService.composite | 32 - .../main/resources/policyHeaders/definitions.xml | 54 - .../policyHeaders/policyHeaders.composite | 46 - .../main/resources/properties/properties.composite | 55 - .../jms/src/main/resources/simple/client.composite | 39 - .../src/main/resources/simple/mpclient.composite | 38 - .../src/main/resources/simple/mpservice.composite | 36 - .../src/main/resources/simple/service.composite | 36 - .../src/main/resources/simple/uriclient.composite | 33 - .../tuscany/sca/binding/jms/DefaultsTestCase.java | 54 - .../sca/binding/jms/DynamicReplyQTestCase.java | 53 - .../sca/binding/jms/ExceptionsTestCase.java | 109 -- .../sca/binding/jms/ExternalBrokerTestCase.java | 70 - .../sca/binding/jms/MessageProcessorTestCase.java | 57 - .../sca/binding/jms/NonSCAClientTestCase.java | 142 -- .../tuscany/sca/binding/jms/OneWayTestCase.java | 58 - .../sca/binding/jms/PolicyHeadersTestCase.java | 95 -- .../sca/binding/jms/PropertiesTestCase.java | 93 -- .../tuscany/sca/binding/jms/RPCTestCase.java | 54 - .../tuscany/sca/binding/jms/URIRPCTestCase.java | 54 - .../1.5.1/itest/late-reference-resolution/pom.xml | 126 -- .../src/main/java/calculator/AddService.java | 31 - .../src/main/java/calculator/AddServiceImpl.java | 31 - .../main/java/calculator/CalculatorService.java | 35 - .../java/calculator/CalculatorServiceImpl.java | 74 - .../src/main/java/calculator/DivideService.java | 28 - .../main/java/calculator/DivideServiceImpl.java | 30 - .../src/main/java/calculator/MultiplyService.java | 28 - .../main/java/calculator/MultiplyServiceImpl.java | 30 - .../src/main/java/calculator/SubtractService.java | 31 - .../main/java/calculator/SubtractServiceImpl.java | 31 - ...ny.sca.endpointresolver.EndpointResolverFactory | 19 - .../src/main/resources/nodeA/Calculator.composite | 41 - .../resources/nodeA/META-INF/sca-contribution.xml | 24 - .../src/main/resources/nodeB/Calculator.composite | 32 - .../resources/nodeB/META-INF/sca-contribution.xml | 24 - .../src/main/resources/nodeC/Calculator.composite | 32 - .../resources/nodeC/META-INF/sca-contribution.xml | 24 - .../sca/BindingScaEndpointResolverFactoryImpl.java | 50 - .../sca/BindingScaEndpointResolverImpl.java | 72 - .../LateReferenceResolutionTestCase.java | 97 -- .../src/test/java/calculator/TestRegistryImpl.java | 40 - tags/java/sca/1.5.1/itest/oneway/build.xml | 127 -- tags/java/sca/1.5.1/itest/oneway/pom.xml | 59 - .../tuscany/sca/itest/oneway/OneWayClient.java | 40 - .../tuscany/sca/itest/oneway/OneWayService.java | 47 - .../sca/itest/oneway/impl/OneWayClientImpl.java | 64 - .../sca/itest/oneway/impl/OneWayServiceImpl.java | 68 - .../META-INF/sca-deployables/oneWay.composite | 58 - .../tuscany/sca/itest/oneway/OneWayTestCase.java | 233 ---- .../sca/1.5.1/itest/operation-overloading/pom.xml | 45 - .../sca/test/opoverload/OverloadASourceTarget.java | 61 - .../sca/test/opoverload/impl/OverloadASource.java | 113 -- .../sca/test/opoverload/impl/OverloadATarget.java | 99 -- .../src/main/resources/OperationOverload.composite | 34 - .../test/opoverload/impl/OverloadATestCase.java | 84 -- .../contribution-classes-v2/build-bundles.xml | 39 - .../contribution-classes-v2/pom.xml | 211 --- .../src/main/java/supplychain/OSGiBundleImpl.java | 121 -- .../main/java/supplychain/customer/Customer.java | 33 - .../customer/JavaCustomerComponentImpl.java | 55 - .../customer/OSGiCustomerComponentImpl.java | 51 - .../supplychain/customer/OSGiCustomerImpl.java | 47 - .../retailer/JavaRetailerComponentImpl.java | 57 - .../retailer/OSGiRetailerComponentImpl.java | 46 - .../supplychain/retailer/OSGiRetailerImpl.java | 44 - .../main/java/supplychain/retailer/Retailer.java | 28 - .../shipper/JavaShipperComponentImpl.java | 52 - .../shipper/OSGiShipperComponentImpl.java | 45 - .../java/supplychain/shipper/OSGiShipperImpl.java | 42 - .../src/main/java/supplychain/shipper/Shipper.java | 28 - .../warehouse/JavaWarehouseComponentImpl.java | 51 - .../warehouse/OSGiWarehouseComponentImpl.java | 47 - .../supplychain/warehouse/OSGiWarehouseImpl.java | 44 - .../main/java/supplychain/warehouse/Warehouse.java | 28 - .../src/main/resources/Customer2V2.componentType | 28 - .../src/main/resources/CustomerV2.componentType | 28 - .../META-INF/customer-sca-contribution.xml | 32 - .../META-INF/retailer-sca-contribution.xml | 29 - .../META-INF/shipper-sca-contribution.xml | 27 - .../META-INF/supplychain-sca-contribution.xml | 24 - .../META-INF/warehouse-sca-contribution.xml | 28 - .../src/main/resources/RetailerV2.componentType | 28 - .../src/main/resources/ShipperV2.componentType | 28 - .../src/main/resources/WarehouseV2.componentType | 28 - .../src/main/resources/osgi/Customer.mf | 13 - .../src/main/resources/osgi/Customer2.mf | 13 - .../src/main/resources/osgi/Retailer.mf | 10 - .../src/main/resources/osgi/RetailerJar.mf | 1 - .../src/main/resources/osgi/Shipper.mf | 10 - .../src/main/resources/osgi/SupplyChain.mf | 13 - .../src/main/resources/osgi/Warehouse.mf | 10 - .../src/main/resources/supplychain.composite | 67 - .../contribution-classes/build-bundles.xml | 39 - .../osgi-contribution/contribution-classes/pom.xml | 212 --- .../src/main/java/supplychain/OSGiBundleImpl.java | 121 -- .../main/java/supplychain/customer/Customer.java | 33 - .../customer/JavaCustomerComponentImpl.java | 55 - .../customer/OSGiCustomerComponentImpl.java | 51 - .../supplychain/customer/OSGiCustomerImpl.java | 47 - .../retailer/JavaRetailerComponentImpl.java | 57 - .../retailer/OSGiRetailerComponentImpl.java | 46 - .../supplychain/retailer/OSGiRetailerImpl.java | 44 - .../main/java/supplychain/retailer/Retailer.java | 28 - .../shipper/JavaShipperComponentImpl.java | 52 - .../shipper/OSGiShipperComponentImpl.java | 45 - .../java/supplychain/shipper/OSGiShipperImpl.java | 42 - .../src/main/java/supplychain/shipper/Shipper.java | 28 - .../warehouse/JavaWarehouseComponentImpl.java | 51 - .../warehouse/OSGiWarehouseComponentImpl.java | 47 - .../supplychain/warehouse/OSGiWarehouseImpl.java | 44 - .../main/java/supplychain/warehouse/Warehouse.java | 28 - .../src/main/resources/Customer2V1.componentType | 28 - .../src/main/resources/CustomerV1.componentType | 28 - .../META-INF/customer-sca-contribution.xml | 30 - .../META-INF/retailer-sca-contribution.xml | 26 - .../META-INF/shipper-sca-contribution.xml | 26 - .../META-INF/supplychain-sca-contribution.xml | 24 - .../META-INF/warehouse-sca-contribution.xml | 26 - .../src/main/resources/RetailerV1.componentType | 28 - .../src/main/resources/ShipperV1.componentType | 28 - .../src/main/resources/WarehouseV1.componentType | 28 - .../src/main/resources/osgi/Customer.mf | 13 - .../src/main/resources/osgi/Customer2.mf | 13 - .../src/main/resources/osgi/Retailer.mf | 10 - .../src/main/resources/osgi/RetailerJar.mf | 1 - .../src/main/resources/osgi/Shipper.mf | 10 - .../src/main/resources/osgi/SupplyChain.mf | 13 - .../src/main/resources/osgi/Warehouse.mf | 10 - .../src/main/resources/supplychain.composite | 66 - .../osgi-contribution/contribution-test/pom.xml | 110 -- .../sca/contribution/osgi/OSGiTestUtil.java | 73 - .../osgi/test/MixedContributionTestCase.java | 43 - .../osgi/test/NestedBundleTestCase.java | 182 --- .../osgi/test/OSGiResolverTestCase.java | 257 ---- .../osgi/test/SCAResolverTestCase.java | 240 ---- .../resources/osgi/felix/felix.config.properties | 44 - .../java/sca/1.5.1/itest/osgi-contribution/pom.xml | 52 - .../itest/osgi-implementation/build-bundles.xml | 48 - .../sca/1.5.1/itest/osgi-implementation/pom.xml | 1236 ----------------- .../java/callback/client/CallbackCallback.java | 33 - .../main/java/callback/client/CallbackClient.java | 31 - .../callback/client/JavaCallbackClientImpl.java | 141 -- .../callback/client/OSGiCallbackClientImpl.java | 181 --- .../java/callback/service/CallbackService.java | 39 - .../callback/service/JavaCallbackServiceImpl.java | 68 - .../callback/service/OSGiCallbackServiceImpl.java | 95 -- .../client/ConversationalCallback.java | 50 - .../conversation/client/ConversationalClient.java | 51 - .../client/ConversationalClientActivator.java | 105 -- .../client/ConversationalClientServiceFactory.java | 135 -- .../client/ConversationalClientStatefulImpl.java | 254 ---- .../client/ConversationalClientStatelessImpl.java | 253 ---- .../ConversationalReferenceClient.java | 38 - .../ConversationalReferenceClientActivator.java | 66 - .../ConversationalReferenceClientImpl.java | 45 - .../service/ConversationalService.java | 65 - .../service/ConversationalServiceActivator.java | 76 - .../service/ConversationalServiceFactory.java | 52 - .../service/ConversationalServiceStatefulImpl.java | 121 -- .../ConversationalServiceStatelessImpl.java | 127 -- .../src/main/java/helloworld/Greetings.java | 36 - .../src/main/java/helloworld/HelloWorld.java | 29 - .../java/helloworld/JavaGreetingsComponent.java | 73 - .../java/helloworld/JavaHelloWorldComponent.java | 41 - .../main/java/helloworld/OSGiGreetingsImpl.java | 112 -- .../main/java/helloworld/OSGiHelloWorldImpl.java | 81 -- .../java/helloworld/sdo/HelloWorldService.java | 30 - .../helloworld/sdo/HelloWorldServiceComponent.java | 33 - .../helloworld/sdo/client/HelloWorldClient.java | 30 - .../sdo/client/HelloWorldClientComponent.java | 50 - .../src/main/java/helloworld/ws/HelloWorld.java | 29 - .../main/java/helloworld/ws/HelloWorldService.java | 28 - .../stockquote/OSGiStockQuoteComponentImpl.java | 86 -- .../java/stockquote/OSGiStockQuoteFactoryImpl.java | 65 - .../main/java/stockquote/OSGiStockQuoteImpl.java | 119 -- .../src/main/java/stockquote/StockQuote.java | 31 - .../src/main/java/supplychain/OSGiBundleImpl.java | 163 --- .../main/java/supplychain/customer/Customer.java | 39 - .../customer/JavaCustomerComponentImpl.java | 88 -- .../customer/OSGiCustomerComponentImpl.java | 106 -- .../customer/OSGiCustomerFactoryImpl.java | 65 - .../supplychain/customer/OSGiCustomerImpl.java | 92 -- .../OSGiCustomerWithQueryComponentImpl.java | 100 -- .../customer/OSGiCustomerWithQueryImpl.java | 82 -- .../OSGiStatelessCustomerComponentImpl.java | 30 - .../customer/OSGiStatelessCustomerImpl.java | 35 - .../customer/OSGiVersionedCustomerImpl.java | 98 -- .../retailer/JavaRetailerComponentImpl.java | 67 - .../retailer/OSGiRetailerComponentImpl.java | 64 - .../supplychain/retailer/OSGiRetailerImpl.java | 58 - .../retailer/OSGiRetailerServiceImpl.java | 45 - .../OSGiRetailerWithQueryComponentImpl.java | 78 -- .../retailer/OSGiRetailerWithQueryImpl.java | 64 - .../retailer/OSGiVersionedRetailerImpl.java | 75 - .../retailer/OSGiVersionedRetailerServiceImpl.java | 47 - .../main/java/supplychain/retailer/Retailer.java | 28 - .../java/supplychain/retailer/RetailerQuery.java | 28 - .../shipper/JavaShipperComponentImpl.java | 58 - .../shipper/OSGiShipperComponentImpl.java | 62 - .../shipper/OSGiShipperFactoryImpl.java | 78 -- .../java/supplychain/shipper/OSGiShipperImpl.java | 57 - .../shipper/OSGiShipperServiceImpl.java | 43 - .../shipper/OSGiStatelessShipperComponentImpl.java | 30 - .../shipper/OSGiStatelessShipperServiceImpl.java | 35 - .../shipper/OSGiVersionedShipperImpl.java | 78 -- .../shipper/OSGiVersionedShipperServiceImpl.java | 46 - .../src/main/java/supplychain/shipper/Shipper.java | 28 - .../warehouse/JavaWarehouseComponentImpl.java | 48 - .../JavaWarehouseWithQueryComponentImpl.java | 52 - .../warehouse/OSGiWarehouseComponentImpl.java | 57 - .../supplychain/warehouse/OSGiWarehouseImpl.java | 68 - .../warehouse/OSGiWarehouseServiceImpl.java | 62 - .../main/java/supplychain/warehouse/Warehouse.java | 28 - .../java/supplychain/warehouse/WarehouseQuery.java | 28 - .../callback/CallbackClient.componentType | 31 - .../callback/CallbackService.componentType | 27 - .../resources/callback/callback-test1.composite | 39 - .../resources/callback/callback-test2.composite | 41 - .../resources/callback/callback-test3.composite | 38 - .../ConversationalClient.componentType | 37 - .../ConversationalReferenceClient.componentType | 28 - .../ConversationalService.componentType | 29 - .../conversation/conversation-test.composite | 162 --- .../main/resources/factory/Customer.componentType | 34 - .../main/resources/factory/Retailer.componentType | 29 - .../main/resources/factory/Shipper.componentType | 29 - .../main/resources/factory/Warehouse.componentType | 28 - .../resources/factory/ds/Customer.componentType | 34 - .../resources/factory/ds/Retailer.componentType | 29 - .../resources/factory/ds/Shipper.componentType | 29 - .../resources/factory/ds/Warehouse.componentType | 28 - .../resources/factory/ds/factory-ds-test.composite | 130 -- .../main/resources/factory/factory-test.composite | 116 -- .../resources/helloworld/Greetings.componentType | 30 - .../resources/helloworld/HelloWorld.componentType | 31 - .../resources/interfaces/Customer.componentType | 31 - .../resources/interfaces/Retailer.componentType | 35 - .../resources/interfaces/Shipper.componentType | 29 - .../resources/interfaces/Warehouse.componentType | 31 - .../resources/interfaces/ds/Customer.componentType | 31 - .../resources/interfaces/ds/Retailer.componentType | 35 - .../resources/interfaces/ds/Shipper.componentType | 29 - .../interfaces/ds/Warehouse.componentType | 31 - .../interfaces/ds/interfaces-ds-test.composite | 57 - .../resources/interfaces/interfaces-test.composite | 57 - .../main/resources/osgi/callback/CallbackClient.mf | 10 - .../resources/osgi/callback/CallbackService.mf | 10 - .../osgi/conversation/ConversationalClient.mf | 11 - .../conversation/ConversationalReferenceClient.mf | 11 - .../osgi/conversation/ConversationalService.mf | 11 - .../src/main/resources/osgi/factory/Customer.mf | 11 - .../src/main/resources/osgi/factory/Retailer.mf | 10 - .../src/main/resources/osgi/factory/Shipper.mf | 10 - .../src/main/resources/osgi/factory/ds/Customer.mf | 10 - .../main/resources/osgi/factory/ds/Customer.xml | 41 - .../src/main/resources/osgi/factory/ds/Retailer.mf | 11 - .../main/resources/osgi/factory/ds/Retailer1.xml | 32 - .../main/resources/osgi/factory/ds/Retailer2.xml | 32 - .../src/main/resources/osgi/factory/ds/Shipper.mf | 10 - .../main/resources/osgi/factory/ds/Shipper1.xml | 34 - .../main/resources/osgi/factory/ds/Shipper2.xml | 34 - .../main/resources/osgi/factory/ds/Warehouse.mf | 11 - .../main/resources/osgi/factory/ds/Warehouse.xml | 32 - .../src/main/resources/osgi/interfaces/Customer.mf | 11 - .../src/main/resources/osgi/interfaces/Retailer.mf | 10 - .../src/main/resources/osgi/interfaces/Shipper.mf | 10 - .../main/resources/osgi/interfaces/ds/Customer.mf | 10 - .../main/resources/osgi/interfaces/ds/Customer.xml | 43 - .../main/resources/osgi/interfaces/ds/Retailer.mf | 11 - .../main/resources/osgi/interfaces/ds/Retailer.xml | 39 - .../main/resources/osgi/interfaces/ds/Shipper.mf | 10 - .../main/resources/osgi/interfaces/ds/Shipper.xml | 34 - .../src/main/resources/osgi/passbyref/Greetings.mf | 11 - .../osgi/properties/ManagedStockQuoteFactory.mf | 11 - .../main/resources/osgi/properties/StockQuote.mf | 10 - .../resources/osgi/properties/StockQuoteFactory.mf | 11 - .../resources/osgi/properties/ds/StockQuote.mf | 12 - .../resources/osgi/properties/ds/StockQuote.xml | 27 - .../osgi/properties/ds/StockQuoteFactory.mf | 12 - .../osgi/properties/ds/StockQuoteFactory.xml | 27 - .../main/resources/osgi/sdo/ds/HelloWorldClient.mf | 14 - .../resources/osgi/sdo/ds/HelloWorldClient.xml | 33 - .../resources/osgi/sdo/ds/HelloWorldService.mf | 13 - .../resources/osgi/sdo/ds/HelloWorldService.xml | 25 - .../src/main/resources/osgi/services/Customer.mf | 11 - .../src/main/resources/osgi/services/Retailer.mf | 10 - .../src/main/resources/osgi/services/Shipper.mf | 10 - .../src/main/resources/osgi/services/Warehouse.mf | 10 - .../main/resources/osgi/services/ds/Customer.mf | 10 - .../main/resources/osgi/services/ds/Customer.xml | 41 - .../main/resources/osgi/services/ds/Retailer.mf | 11 - .../main/resources/osgi/services/ds/Retailer1.xml | 32 - .../main/resources/osgi/services/ds/Retailer2.xml | 32 - .../src/main/resources/osgi/services/ds/Shipper.mf | 10 - .../main/resources/osgi/services/ds/Shipper1.xml | 34 - .../main/resources/osgi/services/ds/Shipper2.xml | 34 - .../main/resources/osgi/services/ds/Warehouse.mf | 11 - .../main/resources/osgi/services/ds/Warehouse1.xml | 32 - .../main/resources/osgi/services/ds/Warehouse2.xml | 32 - .../src/main/resources/osgi/version/Customer1.mf | 11 - .../src/main/resources/osgi/version/Customer2.mf | 11 - .../src/main/resources/osgi/version/Retailer1.mf | 10 - .../src/main/resources/osgi/version/Retailer2.mf | 10 - .../src/main/resources/osgi/version/Shipper1.mf | 10 - .../src/main/resources/osgi/version/Shipper2.mf | 10 - .../src/main/resources/osgi/version/Warehouse1.mf | 10 - .../src/main/resources/osgi/version/Warehouse2.mf | 10 - .../main/resources/osgi/version/ds/Customer1.mf | 10 - .../main/resources/osgi/version/ds/Customer2.mf | 10 - .../main/resources/osgi/version/ds/CustomerV1.xml | 41 - .../main/resources/osgi/version/ds/CustomerV2.xml | 41 - .../main/resources/osgi/version/ds/Retailer1.mf | 11 - .../main/resources/osgi/version/ds/Retailer1V1.xml | 34 - .../main/resources/osgi/version/ds/Retailer1V2.xml | 34 - .../main/resources/osgi/version/ds/Retailer2.mf | 11 - .../main/resources/osgi/version/ds/Retailer2V1.xml | 33 - .../main/resources/osgi/version/ds/Retailer2V2.xml | 33 - .../src/main/resources/osgi/version/ds/Shipper1.mf | 10 - .../main/resources/osgi/version/ds/Shipper1V1.xml | 35 - .../main/resources/osgi/version/ds/Shipper1V2.xml | 35 - .../src/main/resources/osgi/version/ds/Shipper2.mf | 10 - .../main/resources/osgi/version/ds/Shipper2V1.xml | 35 - .../main/resources/osgi/version/ds/Shipper2V2.xml | 35 - .../main/resources/osgi/version/ds/Warehouse1.mf | 11 - .../resources/osgi/version/ds/Warehouse1V1.xml | 32 - .../resources/osgi/version/ds/Warehouse1V2.xml | 32 - .../main/resources/osgi/version/ds/Warehouse2.mf | 11 - .../resources/osgi/version/ds/Warehouse2V1.xml | 32 - .../resources/osgi/version/ds/Warehouse2V2.xml | 32 - .../src/main/resources/osgi/wiring/Customer.mf | 11 - .../src/main/resources/osgi/wiring/Retailer.mf | 10 - .../src/main/resources/osgi/wiring/Shipper.mf | 10 - .../src/main/resources/osgi/wiring/Warehouse.mf | 10 - .../src/main/resources/osgi/wiring/ds/Customer.mf | 10 - .../src/main/resources/osgi/wiring/ds/Customer.xml | 41 - .../src/main/resources/osgi/wiring/ds/Retailer.mf | 11 - .../main/resources/osgi/wiring/ds/Retailer1.xml | 33 - .../main/resources/osgi/wiring/ds/Retailer2.xml | 33 - .../src/main/resources/osgi/wiring/ds/Shipper.mf | 10 - .../src/main/resources/osgi/wiring/ds/Shipper1.xml | 35 - .../src/main/resources/osgi/wiring/ds/Shipper2.xml | 34 - .../src/main/resources/osgi/wiring/ds/Warehouse.mf | 11 - .../main/resources/osgi/wiring/ds/Warehouse1.xml | 33 - .../main/resources/osgi/wiring/ds/Warehouse2.xml | 33 - .../src/main/resources/osgi/ws/HelloWorld.mf | 12 - .../resources/passbyref/Greetings.componentType | 30 - .../resources/passbyref/passbyref-test.composite | 39 - .../resources/properties/StockQuote.componentType | 28 - .../properties/StockQuoteFactory.componentType | 28 - .../properties/ds/StockQuote.componentType | 28 - .../properties/ds/StockQuoteFactory.componentType | 28 - .../properties/ds/properties-ds-test.composite | 39 - .../properties/ds/properties2-ds-test.composite | 54 - .../resources/properties/properties-test.composite | 39 - .../properties/properties2-test.composite | 50 - .../sdo/ds/HelloWorldClient.componentType | 30 - .../sdo/ds/HelloWorldService.componentType | 25 - .../resources/sdo/ds/META-INF/sca-contribution.xml | 26 - .../src/main/resources/sdo/ds/helloworld.wsdl | 88 -- .../main/resources/sdo/ds/helloworldsdo.composite | 47 - .../main/resources/services/Customer.componentType | 34 - .../main/resources/services/Retailer.componentType | 33 - .../main/resources/services/Shipper.componentType | 30 - .../resources/services/Warehouse.componentType | 28 - .../resources/services/ds/Customer.componentType | 34 - .../resources/services/ds/Retailer.componentType | 33 - .../resources/services/ds/Shipper.componentType | 30 - .../resources/services/ds/Warehouse.componentType | 28 - .../services/ds/services-ds-test.composite | 90 -- .../resources/services/services-test.composite | 89 -- .../resources/stockquote/StockQuote.componentType | 28 - .../main/resources/version/Customer1.componentType | 34 - .../main/resources/version/Customer2.componentType | 34 - .../main/resources/version/Retailer1.componentType | 33 - .../main/resources/version/Retailer2.componentType | 33 - .../main/resources/version/Shipper1.componentType | 30 - .../main/resources/version/Shipper2.componentType | 30 - .../resources/version/Warehouse1.componentType | 28 - .../resources/version/Warehouse2.componentType | 28 - .../resources/version/ds/Customer1.componentType | 34 - .../resources/version/ds/Customer2.componentType | 34 - .../resources/version/ds/Retailer1.componentType | 33 - .../resources/version/ds/Retailer2.componentType | 33 - .../resources/version/ds/Shipper1.componentType | 30 - .../resources/version/ds/Shipper2.componentType | 30 - .../resources/version/ds/Warehouse1.componentType | 28 - .../resources/version/ds/Warehouse2.componentType | 28 - .../resources/version/ds/version-ds-test.composite | 184 --- .../main/resources/version/version-test.composite | 170 --- .../main/resources/wiring/Customer.componentType | 34 - .../main/resources/wiring/Retailer.componentType | 29 - .../main/resources/wiring/Shipper.componentType | 29 - .../main/resources/wiring/Warehouse.componentType | 28 - .../resources/wiring/ds/Customer.componentType | 34 - .../resources/wiring/ds/Retailer.componentType | 29 - .../main/resources/wiring/ds/Shipper.componentType | 29 - .../resources/wiring/ds/Warehouse.componentType | 28 - .../resources/wiring/ds/wiring-ds-test1.composite | 136 -- .../resources/wiring/ds/wiring-ds-test2.composite | 151 -- .../main/resources/wiring/wiring-test1.composite | 127 -- .../main/resources/wiring/wiring-test2.composite | 151 -- .../src/main/resources/ws/HelloWorld.componentType | 31 - .../src/main/resources/ws/helloworld.wsdl | 80 -- .../src/main/resources/ws/ws-helloworld.composite | 51 - .../src/test/java/callback/Callback1TestCase.java | 30 - .../src/test/java/callback/Callback2TestCase.java | 29 - .../src/test/java/callback/Callback3TestCase.java | 29 - .../src/test/java/callback/CallbackTestCase.java | 50 - .../java/conversation/ConversationTestCase.java | 325 ----- .../helloworld/passbyref/PassByRefTestCase.java | 130 -- .../src/test/java/helloworld/sdo/SdoTestCase.java | 95 -- .../java/helloworld/ws/HelloWorldTestCase.java | 55 - .../test/java/supplychain/SupplyChainTestCase.java | 63 - .../supplychain/VersionedSupplyChainTestCase.java | 71 - .../supplychain/factory/DSFactoryTestCase.java | 32 - .../java/supplychain/factory/FactoryTestCase.java | 72 - .../interfaces/DSInterfacesTestCase.java | 32 - .../supplychain/interfaces/InterfacesTestCase.java | 32 - .../properties/DSProperties2TestCase.java | 31 - .../properties/DSPropertiesTestCase.java | 31 - .../properties/Properties2TestCase.java | 69 - .../supplychain/properties/PropertiesTestCase.java | 58 - .../supplychain/services/DSServicesTestCase.java | 32 - .../supplychain/services/ServicesTestCase.java | 32 - .../supplychain/version/DSVersionTestCase.java | 33 - .../java/supplychain/version/VersionTestCase.java | 33 - .../java/supplychain/wiring/DSWiring1TestCase.java | 33 - .../java/supplychain/wiring/DSWiring2TestCase.java | 33 - .../java/supplychain/wiring/Wiring1TestCase.java | 32 - .../java/supplychain/wiring/Wiring2TestCase.java | 32 - .../src/test/java/test/OSGiTestCase.java | 67 - .../src/test/java/util/OSGiTestUtil.java | 71 - .../resources/osgi/felix/felix.config.properties | 45 - .../itest/osgi-tuscany/osgi-tuscany-test/pom.xml | 99 -- .../test/osgi/runtime/impl/EquinoxTestRuntime.java | 92 -- .../test/osgi/runtime/impl/FelixTestRuntime.java | 163 --- .../test/osgi/runtime/impl/OSGiTestRuntime.java | 163 --- .../tuscany/sca/test/util/OSGiRuntimeLoader.java | 86 -- .../tuscany/sca/test/util/TuscanyLoader.java | 136 -- .../harness/OSGiTuscanyNonOSGiTestHarness.java | 109 -- .../test/osgi/harness/OSGiTuscanyTestHarness.java | 243 ---- .../CalculatorImplementationPoliciesTestCase.java | 61 - .../test/osgi/tuscany/CalculatorRmiTestCase.java | 62 - .../osgi/tuscany/CalculatorScriptTestCase.java | 63 - .../osgi/tuscany/CallbackWsClientTestCase.java | 61 - .../osgi/tuscany/CallbackWsServiceTestCase.java | 61 - .../tuscany/HelloworldWsServiceJmsTestCase.java | 61 - .../tuscany/HelloworldWsServiceSecureTestCase.java | 61 - .../osgi/tuscany/HelloworldWsServiceTestCase.java | 61 - .../test/osgi/tuscany/NonOSGiSamplesTestCase.java | 85 -- .../test/osgi/tuscany/OSGiSupplyChainTestCase.java | 71 - .../osgi/tuscany/OSGiTuscanyRuntimeTestCase.java | 137 -- .../tuscany/TuscanySampleExtensionsTestCase.java | 93 -- .../TuscanySamplesUsingOldDomainTestCase.java | 80 -- .../src/test/resources/META-INF/MANIFEST.MF | 14 - .../test/resources/felix/felix.config.properties | 45 - tags/java/sca/1.5.1/itest/osgi-tuscany/pom.xml | 39 - .../osgi-tuscany/test-bundles/build-bundles.xml | 31 - .../1.5.1/itest/osgi-tuscany/test-bundles/pom.xml | 124 -- .../java/supplychain/client/SupplyChainClient.java | 115 -- .../main/java/supplychain/customer/Customer.java | 37 - .../customer/JavaCustomerComponentImpl.java | 61 - .../retailer/JavaRetailerComponentImpl.java | 59 - .../main/java/supplychain/retailer/Retailer.java | 28 - .../shipper/JavaShipperComponentImpl.java | 50 - .../src/main/java/supplychain/shipper/Shipper.java | 28 - .../warehouse/JavaWarehouseComponentImpl.java | 49 - .../main/java/supplychain/warehouse/Warehouse.java | 28 - .../src/main/resources/META-INF/SupplyChain.mf | 12 - .../main/resources/META-INF/SupplyChainClient.mf | 21 - .../main/resources/META-INF/sca-contribution.xml | 26 - .../resources/supplychain/supplychain.composite | 48 - .../main/resources/supplychain/ws/Customer.wsdl | 135 -- .../resources/supplychain/ws/supplychain.composite | 55 - .../osgi-tuscany/tuscany-osgi-installer/pom.xml | 671 --------- .../sca/installer/InstallerBundleActivator.java | 405 ------ .../itest/osgi-tuscany/tuscany-versioned/pom.xml | 644 --------- .../1.5.1/itest/policy-security-basicauth/pom.xml | 114 -- .../main/java/helloworld/HelloWorldClientImpl.java | 40 - .../main/java/helloworld/HelloWorldService.java | 30 - .../java/helloworld/HelloWorldServiceImpl.java | 46 - .../src/main/resources/definitions.xml | 44 - .../src/main/resources/helloworld.composite | 46 - .../tuscany/sca/itest/BasicAuthTestCase.java | 114 -- .../sca/1.5.1/itest/policy-security-jsr250/pom.xml | 74 - .../src/main/java/helloworld/HelloWorldImpl.java | 51 - .../main/java/helloworld/HelloWorldService.java | 38 - .../src/main/resources/definitions.xml | 29 - .../src/main/resources/helloworld.composite | 33 - .../sca/itest/PolicySecurityJSR250TestCase.java | 54 - .../sca/1.5.1/itest/policy-security-token/pom.xml | 113 -- .../main/java/helloworld/HelloWorldClientImpl.java | 41 - .../main/java/helloworld/HelloWorldService.java | 30 - .../java/helloworld/HelloWorldServiceImpl.java | 54 - .../src/main/resources/definitions.xml | 49 - .../src/main/resources/helloworld.composite | 56 - .../src/main/resources/jndi.properties | 39 - .../tuscany/sca/itest/TokenAuthTestCase.java | 117 -- tags/java/sca/1.5.1/itest/policy-security/pom.xml | 67 - .../src/main/java/helloworld/HelloWorldImpl.java | 33 - .../main/java/helloworld/HelloWorldService.java | 30 - .../src/main/resources/definitions.xml | 33 - .../src/main/resources/helloworld.composite | 34 - .../tuscany/sca/itest/PolicyIdentityTestCase.java | 54 - tags/java/sca/1.5.1/itest/policy/pom.xml | 68 - .../src/main/java/calculator/AddService.java | 34 - .../src/main/java/calculator/AddServiceImpl.java | 35 - .../src/main/java/calculator/CalculatorClient.java | 69 - .../main/java/calculator/CalculatorService.java | 35 - .../java/calculator/CalculatorServiceImpl.java | 76 - .../src/main/java/calculator/DivideService.java | 33 - .../main/java/calculator/DivideServiceImpl.java | 35 - .../src/main/java/calculator/MultiplyService.java | 28 - .../main/java/calculator/MultiplyServiceImpl.java | 35 - .../src/main/java/calculator/PolicyQNames.java | 43 - .../src/main/java/calculator/SubtractService.java | 28 - .../main/java/calculator/SubtractServiceImpl.java | 35 - .../calculator/policy/TestImplPolicyHandler.java | 84 -- .../calculator/policy/TestRefPolicyHandler.java | 61 - .../calculator/policy/TestSvcPolicyHandler.java | 61 - .../policy/src/main/resources/Calculator.composite | 66 - ...ca.contribution.processor.StAXArtifactProcessor | 19 - ...rg.apache.tuscany.sca.policy.util.PolicyHandler | 28 - .../policy/src/main/resources/definitions.xml | 147 -- .../sca/itest/PoliciedCalculatorTestCase.java | 55 - .../java/org/apache/tuscany/sca/itest/Policy.java | 33 - .../tuscany/sca/itest/TestPolicyProcessor.java | 82 -- tags/java/sca/1.5.1/itest/pom.xml | 734 ---------- .../itest/promotion-interface-missmatch/pom.xml | 59 - .../main/java/com/example/BusinessException.java | 43 - .../src/main/java/com/example/ExampleClient.java | 23 - .../main/java/com/example/ExampleClientImpl.java | 44 - .../src/main/java/com/example/ExampleService.java | 27 - .../main/java/com/example/ExampleServiceImpl.java | 26 - .../src/main/resources/example.composite | 50 - .../src/main/resources/wsdl/ExampleService.wsdl | 133 -- .../main/resources/wsdl/ExampleServiceTypes.xsd | 45 - .../src/test/java/com/example/ExampleTestCase.java | 44 - tags/java/sca/1.5.1/itest/properties/pom.xml | 91 -- .../java/mysca/test/myservice/impl/MyService.java | 34 - .../mysca/test/myservice/impl/MyServiceImpl.java | 88 -- .../test/myservice/impl/MyTotalServiceImpl.java | 46 - .../apache/tuscany/sca/itest/ABCDComponent.java | 50 - .../tuscany/sca/itest/ABCDComponentImpl.java | 73 - .../org/apache/tuscany/sca/itest/ABComponent.java | 75 - .../apache/tuscany/sca/itest/ABComponentImpl.java | 131 -- .../org/apache/tuscany/sca/itest/CDComponent.java | 71 - .../apache/tuscany/sca/itest/CDComponentImpl.java | 143 -- .../tuscany/sca/itest/ComplexPropertyBean.java | 151 -- .../apache/tuscany/sca/itest/OverrideService.java | 27 - .../tuscany/sca/itest/OverrideServiceImpl.java | 28 - .../tuscany/sca/itest/PropertyComponent.java | 134 -- .../tuscany/sca/itest/PropertyComponentImpl.java | 188 --- .../apache/tuscany/sca/itest/PropertyService.java | 27 - .../java/org/apache/tuscany/sca/itest/cdi/Bar.java | 23 - .../org/apache/tuscany/sca/itest/cdi/Foo1.java | 39 - .../org/apache/tuscany/sca/itest/cdi/Foo2.java | 39 - .../org/apache/tuscany/sca/itest/cdi/Foo3.java | 44 - .../main/java/test/jaxb/props/ObjectFactory.java | 78 -- .../java/test/jaxb/props/ReturnCodeProperties.java | 109 -- .../main/java/test/jaxb/props/package-info.java | 27 - .../ConstructorPropertyInjection.composite | 41 - .../properties/src/main/resources/Outer.composite | 43 - .../src/main/resources/OuterPropertyTest.composite | 42 - .../src/main/resources/PropertyTest.composite | 255 ---- .../properties/src/main/resources/customer.xsd | 30 - .../properties/src/main/resources/fileProperty.txt | 21 - .../src/main/resources/manyValuesFileProperty.txt | 23 - .../src/main/resources/mySimpleService.composite | 40 - .../properties/src/main/resources/rcProps.txt | 22 - .../properties/src/main/resources/rcprops.xsd | 55 - .../tuscany/sca/itest/MyTotalServiceTestCase.java | 99 -- .../tuscany/sca/itest/OuterPropertyTestCase.java | 164 --- .../apache/tuscany/sca/itest/PropertyTestCase.java | 468 ------- .../cdi/ConstructorPropertyInjectionTestCase.java | 44 - .../sca/1.5.1/itest/recursive-multi-level/pom.xml | 45 - .../main/java/mysca/test/myservice/MyService.java | 26 - .../java/mysca/test/myservice/MyServiceImpl.java | 48 - .../mysca/test/myservice/MySimpleTotalService.java | 25 - .../test/myservice/MySimpleTotalServiceImpl.java | 46 - .../src/main/resources/TotalService1Auto.composite | 52 - .../src/main/resources/TotalService2Auto.composite | 49 - .../src/main/resources/TotalService3Auto.composite | 52 - .../java/test/sca/tests/MultiLevelTestCase.java | 68 - tags/java/sca/1.5.1/itest/recursive-ws/pom.xml | 87 -- .../recursive-ws/src/main/java/policy/Target.java | 26 - .../src/main/java/policy/TargetClientImpl.java | 33 - .../src/main/java/policy/TargetServiceImpl.java | 29 - .../src/main/java/recursive/Composer.java | 26 - .../src/main/java/recursive/ComposerClient.java | 35 - .../main/java/recursive/ComposerClientImpl.java | 38 - .../src/main/java/recursive/ComposerImpl.java | 34 - .../src/main/java/recursive/ComposerServer.java | 35 - .../src/main/resources/Client.composite | 28 - .../src/main/resources/Inner.composite | 26 - .../src/main/resources/Outer.composite | 31 - .../bindingoverride/InnerComposite.composite | 36 - .../bindingoverride/OuterComposite.composite | 40 - .../policy/PolicyInnerComposite.composite | 37 - .../policy/PolicyOuterComposite.composite | 41 - .../src/main/resources/policy/definitions.xml | 39 - .../bindingoverride/BindingOverrideTestCase.java | 57 - .../src/test/java/policy/PolicyTestCase.java | 74 - .../java/recursive/ComposerClientTestCase.java | 68 - .../test/java/recursive/ComposerTestServer.java | 55 - tags/java/sca/1.5.1/itest/recursive/pom.xml | 45 - .../src/main/java/circular/include/DemoClass.java | 27 - .../src/main/java/composite/CompositeClient.java | 42 - .../recursive/src/main/java/composite/Source.java | 24 - .../src/main/java/composite/SourceCallback.java | 24 - .../src/main/java/composite/SourceImpl.java | 59 - .../recursive/src/main/java/composite/Target.java | 30 - .../src/main/java/composite/TargetImpl.java | 44 - .../1.5.1/itest/recursive/src/main/java/foo/A.java | 28 - .../1.5.1/itest/recursive/src/main/java/foo/B.java | 36 - .../1.5.1/itest/recursive/src/main/java/foo/I.java | 23 - .../recursive/src/main/java/policy/Target.java | 26 - .../src/main/java/policy/TargetClientImpl.java | 33 - .../src/main/java/policy/TargetServiceImpl.java | 29 - .../src/main/java/sample/ComponentAImpl.java | 41 - .../src/main/java/sample/ComponentCImpl.java | 41 - .../src/main/java/sample/ComponentEImpl.java | 38 - .../src/main/java/sample/ComponentFImpl.java | 45 - .../recursive/src/main/java/sample/Service1.java | 27 - .../recursive/src/main/java/test/Aggregator.java | 27 - .../src/main/java/test/AggregatorImpl.java | 55 - .../src/main/java/test/InnerSourceImpl.java | 34 - .../src/main/java/test/OuterSourceImpl.java | 34 - .../itest/recursive/src/main/java/test/Source.java | 30 - .../src/main/java/test1/composite/Target.java | 23 - .../src/main/java/test1/composite/TargetOne.java | 29 - .../src/main/java/test1/composite/TargetTwo.java | 29 - .../src/main/resources/AComposite.composite | 30 - .../src/main/resources/BComposite.composite | 45 - .../src/main/resources/CComposite.composite | 44 - .../src/main/resources/Composite1.composite | 42 - .../src/main/resources/Composite2.composite | 43 - .../src/main/resources/Composite3.composite | 48 - .../src/main/resources/Demo1Composite.composite | 27 - .../src/main/resources/Demo2Composite.composite | 28 - .../recursive/src/main/resources/Inner.composite | 45 - .../src/main/resources/InnerComposite.composite | 41 - .../src/main/resources/InnerComposite2.composite | 33 - .../main/resources/META-INF/sca-contribution.xml | 24 - .../recursive/src/main/resources/Outer.composite | 39 - .../src/main/resources/OuterComposite.composite | 39 - .../itest/recursive/src/main/resources/foo/foo.png | Bin 571816 -> 0 bytes .../recursive/src/main/resources/foo/o1.composite | 31 - .../recursive/src/main/resources/foo/o2.composite | 31 - .../recursive/src/main/resources/foo/o3.composite | 35 - .../recursive/src/main/resources/foo/o4.composite | 37 - .../policy/PolicyInnerComposite.composite | 32 - .../policy/PolicyOuterComposite.composite | 35 - .../src/main/resources/policy/definitions.xml | 46 - .../main/resources/test1/InnerComposite.composite | 39 - .../main/resources/test1/OuterComposite.composite | 27 - .../circular/include/CircularIncludeTestCase.java | 39 - .../src/test/java/composite/CompositeTestCase.java | 50 - .../LocateServiceEmbeddedSCADomainTestCase.java | 113 -- .../composite/LocateServiceSCADomainTestCase.java | 73 - .../recursive/src/test/java/foo/O2TestCase.java | 32 - .../recursive/src/test/java/foo/O4TestCase.java | 39 - .../src/test/java/policy/PolicyTestCase.java | 68 - .../itest/recursive/src/test/java/sample/C.java | 32 - .../recursive/src/test/java/sample/CImpl.java | 80 -- .../src/test/java/sample/NestedTestCase.java | 96 -- .../sample/RecursiveCompositeTestCaseFIXME.java | 53 - .../itest/recursive/src/test/java/sample/X.java | 32 - .../recursive/src/test/java/sample/XImpl.java | 37 - .../itest/recursive/src/test/java/sample/Y.java | 32 - .../recursive/src/test/java/sample/YImpl.java | 38 - .../src/test/java/test/InnerTestCase.java | 51 - .../src/test/java/test/OuterTestCase.java | 53 - .../test1/composite/CompositeClientTestCase.java | 62 - .../sca/1.5.1/itest/references-collection/pom.xml | 53 - .../src/main/java/crawler/Crawler.java | 46 - .../src/main/java/crawler/CrawlerController.java | 41 - .../java/crawler/impl/CrawlerControllerImpl.java | 80 -- .../src/main/java/crawler/impl/CrawlerImpl.java | 69 - .../main/java/crawler/impl/SpecialCrawlerImpl.java | 69 - .../src/main/resources/test.composite | 51 - .../crawler/ReferenceMultiplicityTestCase.java | 134 -- tags/java/sca/1.5.1/itest/references/pom.xml | 53 - .../tuscany/sca/itest/references/AComponent.java | 40 - .../sca/itest/references/AComponentImpl.java | 126 -- .../tuscany/sca/itest/references/BComponent.java | 26 - .../sca/itest/references/BComponentImpl.java | 39 - .../references/BComponentWrongTargetImpl.java | 39 - .../tuscany/sca/itest/references/CComponent.java | 24 - .../sca/itest/references/CComponentImpl.java | 27 - .../tuscany/sca/itest/references/DComponent.java | 27 - .../sca/itest/references/DComponentImpl.java | 35 - .../resources/AutoWiredReferencesTest.composite | 65 - .../main/resources/InnerReferencesTest.composite | 54 - .../resources/ManualWiredReferencesTest.composite | 64 - .../references/AutoWiredReferenceTestCase.java | 102 -- .../itest/references/InnerReferenceTestCase.java | 94 -- .../references/ManualWiredReferenceTestCase.java | 93 -- tags/java/sca/1.5.1/itest/scopes/pom.xml | 47 - .../scopes/CompositeScopeStateVerifierImpl.java | 46 - .../scopes/RequestScopeStateVerifierImpl.java | 50 - .../tuscany/sca/itest/scopes/StateVerifier.java | 25 - .../scopes/src/main/resources/scopes.composite | 33 - .../org/apache/tuscany/sca/test/ScopeTestCase.java | 93 -- tags/java/sca/1.5.1/itest/serialization/pom.xml | 66 - .../servicereference/ConversationalService.java | 81 -- .../ConversationalServiceCallback.java | 37 - .../ConversationalServiceImpl.java | 141 -- .../itest/servicereference/SCAManagedClient.java | 51 - .../servicereference/SCAManagedClientImpl.java | 115 -- .../SCAManagedConversationalClient.java | 55 - .../SCAManagedConversationalClientImpl.java | 132 -- .../itest/servicereference/StatelessService.java | 46 - .../servicereference/StatelessServiceCallback.java | 34 - .../servicereference/StatelessServiceImpl.java | 82 -- .../utils/ServiceReferenceUtils.java | 127 -- .../ServiceReferenceSerializationTest.composite | 45 - .../src/main/resources/nestedcomposite.composite | 33 - .../SerializeServiceReferenceTestCase.java | 145 -- tags/java/sca/1.5.1/itest/services/pom.xml | 46 - .../tuscany/sca/itest/services/AComponent.java | 27 - .../tuscany/sca/itest/services/AComponentImpl.java | 28 - .../tuscany/sca/itest/services/BComponent.java | 25 - .../tuscany/sca/itest/services/BComponentImpl.java | 31 - .../tuscany/sca/itest/services/CComponent.java | 27 - .../tuscany/sca/itest/services/CComponentImpl.java | 28 - .../tuscany/sca/itest/services/D1Component.java | 25 - .../tuscany/sca/itest/services/DComponent.java | 25 - .../tuscany/sca/itest/services/DComponentImpl.java | 34 - .../main/resources/META-INF/sca-contribution.xml | 22 - .../src/main/resources/ServicesTest.composite | 70 - .../sca/itest/services/ServicesTestCase.java | 105 -- tags/java/sca/1.5.1/itest/spring/pom.xml | 112 -- .../java/bigbank/stockquote/StockQuoteImpl.java | 38 - .../java/bigbank/stockquote/StockQuoteService.java | 30 - .../src/main/java/calculator/AddService.java | 28 - .../src/main/java/calculator/AddServiceImpl.java | 35 - .../main/java/calculator/CalculatorService.java | 35 - .../java/calculator/CalculatorServiceImpl.java | 79 -- .../src/main/java/calculator/DivideService.java | 28 - .../main/java/calculator/DivideServiceImpl.java | 35 - .../src/main/java/calculator/MultiplyService.java | 28 - .../main/java/calculator/MultiplyServiceImpl.java | 35 - .../src/main/java/calculator/SubtractService.java | 28 - .../main/java/calculator/SubtractServiceImpl.java | 35 - .../security/CalculatorCallbackHandler.java | 50 - .../java/calculator/security/JaasLoginModule.java | 178 --- .../java/calculator/security/UserPrincipal.java | 66 - .../access/SCAApplicationContextProvider.java | 37 - .../src/main/java/helloworld/HelloWorld.java | 32 - .../src/main/java/helloworld/HelloWorldImpl.java | 38 - .../src/main/java/helloworld/HelloWorldProxy.java | 42 - .../itest/spring/src/main/java/mock/TestBean.java | 31 - .../spring/src/main/java/mock/TestBeanImpl.java | 42 - .../src/main/java/mock/TestHelloWorldBean.java | 39 - .../spring/src/main/java/mock/TestReference.java | 27 - .../src/main/java/mock/TestReferenceBean.java | 57 - .../src/main/java/mock/TestSCAPropertyBean.java | 55 - .../spring/annotations/CalculatorServiceImpl.java | 131 -- .../resources/context/access/Calculator.composite | 49 - .../context/access/CalculatorService-context.xml | 45 - .../resources/context/imports/Calculator.composite | 49 - .../META-INF/spring/CalculatorService-context.xml | 42 - .../META-INF/spring/SpringImport-context.xml | 41 - .../META-INF/spring/SpringHelloWorld-context.xml | 31 - .../META-INF/spring/StockQuoteService-context.xml | 33 - .../multiple/META-INF/spring/beanRefContext.xml | 35 - .../context/multiple/StockQuote.composite | 35 - .../implementation/policies/Calculator.composite | 61 - .../implementation/policies/CalculatorJass.config | 3 - .../policies/CalculatorLogMessages.properties | 18 - .../META-INF/spring/CalculatorService-context.xml | 39 - .../implementation/policies/definitions.xml | 40 - .../location/folder/SpringFolderLocation.composite | 39 - .../location/folder/springapp/META-INF/MANIFEST.MF | 3 - .../META-INF/spring/SpringSCAProperty-context.xml | 38 - .../location/jar/SpringJarLocation.composite | 39 - .../main/resources/location/jar/spring-context.jar | Bin 1471 -> 0 bytes .../spring/SpringDelegationHelloWorld-context.xml | 37 - .../META-INF/spring/SpringHelloWorld-context.xml | 31 - .../spring/SpringDelegationHelloWorld.composite | 32 - .../sca/itest/spring/SpringHelloWorld.composite | 32 - .../spring/SpringExplicitReference-context.xml | 33 - .../spring/SpringImplicitReference-context.xml | 34 - .../references/SpringExplicitReference.composite | 32 - .../references/SpringImplicitReference.composite | 39 - .../spring/SpringExplicitService-context.xml | 39 - .../spring/SpringImplicitService-context.xml | 31 - .../sca/services/SpringExplicitService.composite | 33 - .../sca/services/SpringImplicitService.composite | 32 - .../spring/annotations/Calculator.composite | 60 - .../META-INF/spring/CalculatorService-context.xml | 41 - .../test/java/context/access/CalculatorClient.java | 60 - .../java/context/access/ContextAccessTestCase.java | 32 - .../java/context/imports/CalculatorClient.java | 54 - .../context/imports/ContextImportsTestCase.java | 32 - .../context/multiple/MultipleContextTestCase.java | 32 - .../java/context/multiple/StockQuoteServer.java | 50 - .../implementation/policies/CalculatorClient.java | 79 -- .../policies/ImplementationPoliciesTestCase.java | 32 - .../folder/SpringFolderLocationTestCase.java | 45 - .../location/jar/SpringJarLocationTestCase.java | 45 - .../itest/spring/AbstractHelloWorldTestCase.java | 43 - .../sca/itest/spring/AbstractSCATestCase.java | 70 - .../tuscany/sca/itest/spring/HelloWorld.java | 31 - .../tuscany/sca/itest/spring/HelloWorldProxy.java | 41 - .../spring/SpringDelegationHelloWorldTestCase.java | 35 - .../sca/itest/spring/SpringHelloWorldTestCase.java | 36 - .../sca/itest/spring/TestHelloWorldBean.java | 38 - .../itest/spring/TestHelloWorldDelegatorBean.java | 42 - .../SpringExplicitReferenceTestCase.java | 45 - .../SpringImplicitReferenceTestCase.java | 48 - .../services/SpringExplicitServiceTestCase.java | 40 - .../services/SpringImplicitServiceTestCase.java | 38 - .../java/spring/annotations/CalculatorClient.java | 64 - .../annotations/SpringAnnotationsTestCase.java | 32 - tags/java/sca/1.5.1/itest/transaction/pom.xml | 91 -- .../transaction/AccountNotFoundException.java | 36 - .../sca/itest/transaction/AccountService.java | 31 - .../sca/itest/transaction/AccountServiceImpl.java | 70 - .../transaction/CheckingAccountServiceImpl.java | 143 -- .../sca/itest/transaction/OverDraftException.java | 36 - .../transaction/SavingsAccountServiceImpl.java | 133 -- .../sca/itest/transaction/TransferService.java | 31 - .../sca/itest/transaction/TransferServiceImpl.java | 64 - .../src/main/resources/accounts.composite | 43 - .../transaction/src/main/resources/definitions.xml | 99 -- .../src/main/resources/log4j.properties | 29 - .../transaction/ConcurrentXAResourceTestCase.java | 119 -- .../sca/itest/transaction/TransactionTestCase.java | 53 - tags/java/sca/1.5.1/itest/validation/pom.xml | 166 --- .../main/java/binding/ejb/account/Customer.java | 35 - .../java/binding/ejb/account/CustomerImpl.java | 57 - .../java/binding/ejb/calculator/AddService.java | 27 - .../binding/ejb/calculator/AddServiceHome.java | 31 - .../main/java/binding/jms/HelloWorldService.java | 26 - .../java/binding/jms/HelloWorldServiceImpl.java | 27 - .../main/java/calculator/warning/AddService.java | 32 - .../java/calculator/warning/AddServiceImpl.java | 44 - .../warning/AddServiceImplWithServiceName.java | 46 - .../java/calculator/warning/CalculatorClient.java | 45 - .../java/calculator/warning/CalculatorService.java | 35 - .../calculator/warning/CalculatorServiceImpl.java | 70 - .../java/calculator/warning/DivideService.java | 28 - .../java/calculator/warning/DivideServiceImpl.java | 35 - .../java/calculator/warning/MultiplyService.java | 28 - .../calculator/warning/MultiplyServiceImpl.java | 35 - .../java/calculator/warning/PropertyService.java | 29 - .../calculator/warning/PropertyServiceImpl.java | 41 - .../java/calculator/warning/SubtractService.java | 28 - .../calculator/warning/SubtractServiceImpl.java | 35 - .../SubtractServiceImplWithServiceName.java | 38 - .../src/main/java/impl/java/AddService.java | 29 - .../src/main/java/impl/java/AddServiceImpl.java | 44 - .../src/main/java/impl/java/CalculatorClient.java | 45 - .../src/main/java/impl/java/CalculatorService.java | 35 - .../main/java/impl/java/CalculatorServiceImpl.java | 75 - .../src/main/java/impl/java/DivideService.java | 28 - .../src/main/java/impl/java/DivideServiceImpl.java | 35 - .../src/main/java/impl/java/MultiplyService.java | 28 - .../main/java/impl/java/MultiplyServiceImpl.java | 35 - .../src/main/java/impl/java/SubtractService.java | 28 - .../main/java/impl/java/SubtractServiceImpl.java | 35 - .../src/main/java/impl/osgi/OSGiTestImpl.java | 50 - .../src/main/java/impl/osgi/OSGiTestInterface.java | 31 - .../java/impl/osgi/OSGiTestWithPropertyImpl.java | 65 - .../src/main/java/impl/spring/HelloWorld.java | 36 - .../src/main/java/impl/spring/HelloWorldProxy.java | 41 - .../main/java/impl/spring/TestHelloWorldBean.java | 36 - .../java/interfacejava/xml/CalculatorService.java | 35 - .../interfacejava/xml/CalculatorServiceImpl.java | 75 - .../Calculator.composite | 49 - .../DuplicateComponentName/Calculator.composite | 53 - .../Calculator.composite | 55 - .../dummyImplementation.composite | 31 - .../Calculator.composite | 56 - .../dummyImplementation.composite | 32 - .../DuplicatePropertyName/Calculator.composite | 51 - .../DuplicateReferenceName/Calculator.composite | 50 - .../META-INF/sca/SpringHelloWorld-context.xml | 31 - .../Calculator.composite | 53 - .../NoComponentImplementation/Calculator.composite | 52 - .../NoCompositeNamespace/Calculator.composite | 48 - .../NoMatchingBinding/Calculator.composite | 54 - .../PromotedReferenceNotFound/Calculator.composite | 51 - .../PromotedServiceNotFound/Calculator.composite | 51 - .../PropertyAttribute/Calculator.composite | 55 - .../CalculatorNullMustSupply.composite | 53 - .../CalculatorOverrideManyAttribute.composite | 54 - .../PropertyNotFound/Calculator.composite | 50 - .../Calculator.composite | 51 - .../Calculator.composite | 49 - .../Calculator.composite | 49 - .../ReferenceNotFound/Calculator.composite | 50 - .../ReferenceWithoutTargets/Calculator.composite | 49 - .../Calculator.composite | 54 - .../Calculator.composite | 54 - .../resources/XsdValidation/Calculator.composite | 51 - .../ContributionReadException/Calculator.composite | 53 - .../Calculator.composite | 53 - .../Calculator.composite | 54 - .../UnexpectedBindingElement/Calculator.composite | 55 - .../Calculator.composite | 54 - .../Calculator.composite | 54 - .../InvalidWsdlElementAttr/Calculator.composite | 58 - .../wsxml/MissingImportedXSD/helloworld.wsdl | 76 - .../MissingImportedXSD/helloworldwsjms.composite | 34 - .../wsxml/MustUseWsdlBinding/Calculator.composite | 59 - .../wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl | 92 -- .../helloworldwsjms.composite | 34 - .../wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl | 92 -- .../helloworldwsclient.composite | 45 - .../wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl | 92 -- .../helloworldwsjms.composite | 34 - .../UnknownEJBSessionType/account.composite | 35 - .../bindingejb/UnknownEJBVersion/account.composite | 35 - .../DoesntProcessActivationSpec/service.composite | 36 - .../DoesntProcessDestinationType/service.composite | 35 - .../DoesntProcessHeaders/service.composite | 36 - .../DoesntProcessResourceAdapter/service.composite | 32 - .../service.composite | 35 - .../service.composite | 35 - .../service.composite | 35 - .../InvalidCorrelationScheme/service.composite | 35 - .../InvalidJMSDeliveryMode/service.composite | 36 - .../InvalidJMSPriority/service.composite | 36 - .../service.composite | 35 - .../MissingActivationSpecName/service.composite | 36 - .../MissingConnectionFactoryName/service.composite | 36 - .../service.composite | 36 - .../service.composite | 36 - .../MustStartWithSchema/service.composite | 36 - .../bindingjms/UnexpectedElement/service.composite | 40 - .../bindingjms/UnknownTokenInURI/service.composite | 36 - .../AttributePackageMissing/Calculator.composite | 55 - .../AttributeNameSpaceMissing/Calculator.composite | 55 - .../AttributeURIMissing/Calculator.composite | 55 - .../META-INF/sca-contribution.xml | 24 - .../AttributeCompositeMissing/Calculator.composite | 53 - .../AttributeCompositeMissing/sca-contribution.xml | 24 - .../MultipleCompositeErrors/Calculator.composite | 53 - .../MultipleCompositeErrors/sca-contribution.xml | 31 - .../helloworld.composite | 29 - .../AttributeWithoutNamespace/helloworld.composite | 29 - .../impl/bpel/BPELProcessNotFound/helloworld.bpel | 66 - .../bpel/BPELProcessNotFound/helloworld.composite | 29 - .../impl/bpel/BPELProcessNotFound/helloworld.wsdl | 82 -- .../CannotResolveWSDLReference/helloworld.bpel | 66 - .../helloworld.composite | 29 - .../bpel/MyRolePartnerRoleNull/helloworld.bpel | 66 - .../MyRolePartnerRoleNull/helloworld.composite | 29 - .../bpel/MyRolePartnerRoleNull/helloworld.wsdl | 82 -- .../bpel/PartnerLinkHasBothAttr/helloworld.bpel | 68 - .../PartnerLinkHasBothAttr/helloworld.composite | 29 - .../bpel/PartnerLinkHasBothAttr/helloworld.wsdl | 82 -- .../bpel/PartnerLinkNoMatchingType/helloworld.bpel | 66 - .../PartnerLinkNoMatchingType/helloworld.composite | 29 - .../bpel/PartnerLinkNoMatchingType/helloworld.wsdl | 82 -- .../bpel/PartnerLinkTypeNoRoles/helloworld.bpel | 66 - .../PartnerLinkTypeNoRoles/helloworld.composite | 29 - .../bpel/PartnerLinkTypeNoRoles/helloworld.wsdl | 80 -- .../impl/ejb/EJBLinkAttributeMissing/ejb.composite | 29 - .../ClassNotFoundException/Calculator.composite | 49 - .../Calculator.composite | 49 - .../OSGiTestService.componentType | 28 - .../CouldNotLocateOSGiBundle/osgitest.composite | 34 - .../MissingComponentTypeFile/osgitest.composite | 35 - .../OSGiTestService.componentType | 28 - .../PropertyShouldSpecifySR/osgitest.composite | 36 - .../CouldNotResolveLocation/resource.composite | 30 - .../LocationAttributeMissing/resource.composite | 30 - .../SpringHelloWorld.composite | 27 - .../SpringHelloWorld.composite | 27 - .../SpringHelloWorld-context.xml | 0 .../SpringHelloWorld.composite | 34 - .../TestHelloWorldBean.componentType | 27 - .../CouldNotResolveLocation/widget.composite | 29 - .../LocationAttributeMissing/widget.composite | 30 - .../xquery/CouldNotLocateFile/HelloWorld.composite | 28 - .../LocationAttributeMissing/HelloWorld.composite | 28 - .../ClassNotFoundException/Calculator.composite | 53 - .../CalculatorServiceImpl.componentType | 27 - .../Calculator.composite | 53 - .../CalculatorServiceImpl.componentType | 27 - .../InvalidWSDLInterfaceAttr/Calculator.composite | 54 - .../helloworld-interface.wsdl | 67 - .../helloworld-service.wsdl | 49 - .../xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl | 92 -- .../helloworldwsjms.composite | 34 - .../ClassNotFoundException/Calculator.composite | 56 - .../ClassNotFoundException/definitions.xml | 78 -- .../Calculator.composite | 56 - .../RequiredAttributeRolesMissing/definitions.xml | 78 -- .../Calculator.composite | 56 - .../AlwaysProvidedIntentNotFound/definitions.xml | 63 - .../Calculator.composite | 56 - .../ErrorInPolicyIntentDefinition/definitions.xml | 76 - .../xml/IntentNotSpecified/Calculator.composite | 56 - .../policy/xml/IntentNotSpecified/definitions.xml | 175 --- .../MayProvideIntentNotFound/Calculator.composite | 56 - .../xml/MayProvideIntentNotFound/definitions.xml | 63 - .../RequiredAttributeMissing/Calculator.composite | 56 - .../xml/RequiredAttributeMissing/definitions.xml | 70 - .../xml/UnableToMapPolicies/Calculator.composite | 56 - .../policy/xml/UnableToMapPolicies/definitions.xml | 242 ---- .../Calculator.composite | 56 - .../definitions.xml | 68 - .../assembly/xml/ContributionReadException.java | 61 - .../xml/PolicyImplValidationException.java | 61 - .../xml/PolicyServiceValidationException.java | 61 - .../assembly/xml/UnexpectedBindingElement.java | 61 - .../xml/UnexpectedImplementationElement.java | 61 - .../assembly/xml/UnexpectedInterfaceElement.java | 60 - .../binding/ejb/UnknownEJBSessionTypeTestCase.java | 67 - .../binding/ejb/UnknownEJBVersionTestCase.java | 66 - .../jms/DoesntProcessDestinationTypeTestCase.java | 60 - .../binding/jms/DoesntProcessHeadersTestCase.java | 62 - ...esntProcessResponseDestinationTypeTestCase.java | 60 - .../jms/InvalidCorrelationSchemeTestCase.java | 60 - .../jms/InvalidJMSDeliveryModeTestCase.java | 60 - .../binding/jms/InvalidJMSPriorityTestCase.java | 60 - .../InvalidResponseDestinationTypeTestCase.java | 60 - .../jms/MissingActivationSpecNameTestCase.java | 60 - .../jms/MissingConnectionFactoryNameTestCase.java | 60 - .../jms/MissingResponseActivationSpecTestCase.java | 60 - .../MissingResponseConnectionFactoryTestCase.java | 60 - .../binding/jms/MustStartWithSchemaTestCase.java | 60 - .../binding/jms/UnexpectedElementTestCase.java | 60 - .../binding/jms/UnknownTokenInURITestCase.java | 60 - .../wsxml/InvalidWsdlElementAttrTestCase.java | 61 - .../binding/wsxml/MissingImportedXSDTestCase.java | 64 - .../binding/wsxml/MustUseWsdlBindingTestCase.java | 61 - .../wsxml/WsdlBindingDoesNotMatchTestCase.java | 61 - .../wsxml/WsdlPortTypeDoesNotMatchTestCase.java | 60 - .../wsxml/WsdlServiceDoesNotMatchTestCase.java | 61 - .../ComponentReferenceTargetNotFoundTestCase.java | 77 -- .../warning/DuplicateComponentNameTestCase.java | 61 - ...uplicateImplementationPropertyNameTestCase.java | 65 - ...plicateImplementationReferenceNameTestCase.java | 66 - .../warning/DuplicatePropertyNameTestCase.java | 71 - .../warning/DuplicateReferenceNameTestCase.java | 73 - .../MultipleBindingsForServiceTestCase.java | 71 - .../warning/NoComponentImplementationTestCase.java | 67 - .../warning/NoCompositeNamespaceTestCase.java | 71 - .../warning/NoMatchingBindingTestCase.java | 73 - .../warning/PromotedReferenceNotFoundTestCase.java | 71 - .../warning/PromotedServiceNotFoundTestCase.java | 71 - .../PropertyAttributeMustSupplyNullTestCase.java | 71 - .../warning/PropertyAttributeTestCase.java | 71 - .../warning/PropertyNotFoundTestCase.java | 71 - .../PropertyOverrideManyAttributeTestCase.java | 71 - ...enceIncompatibleComponentInterfaceTestCase.java | 71 - .../ReferenceIncompatibleInterfaceTestCase.java | 71 - .../ReferenceIncompatibleMultiplicityTestCase.java | 71 - .../warning/ReferenceNotFoundTestCase.java | 82 -- .../warning/ReferenceWithoutTargetsTestCase.java | 71 - ...ServiceNotFoundForComponentServiceTestCase.java | 71 - .../UnresolvedComponentImplementationTestCase.java | 67 - .../calculator/warning/XSDValidationTestCase.java | 67 - .../java/AttributePackageMissingTestCase.java | 61 - .../AttributeNameSpaceMissingTestCase.java | 61 - .../resource/AttributeURIMissingTestCase.java | 61 - .../xml/AttributeCompositeMissingTestCase.java | 61 - .../xml/MultipleCompositeErrorsTestCase.java | 64 - .../test/java/domain/CustomCompositeBuilder.java | 227 --- .../AttributeUnrecognizedNamespaceTestCase.java | 61 - .../bpel/AttributeWithoutNamespaceTestCase.java | 60 - .../impl/bpel/BPELProcessNotFoundTestCase.java | 60 - .../bpel/CannotResolveWSDLReferenceTestCase.java | 62 - .../impl/bpel/MyRolePartnerRoleNullTestCase.java | 60 - .../impl/bpel/PartnerLinkHasBothAttrTestCase.java | 59 - .../bpel/PartnerLinkNoMatchingTypeTestCase.java | 61 - .../impl/bpel/PartnerLinkTypeNoRolesTestCase.java | 61 - .../impl/ejb/EJBLinkAttributeMissingTestCase.java | 60 - .../impl/java/ClassNotFoundExceptionTestCase.java | 60 - .../java/ContributionResolveExceptionTestCase.java | 61 - .../osgi/CouldNotLocateOSGiBundleTestCase.java | 64 - .../osgi/MissingComponentTypeFileTestCase.java | 66 - .../src/test/java/impl/osgi/OSGiTestBundles.java | 111 -- .../impl/osgi/PropertyShouldSpecifySRTestCase.java | 64 - .../resource/CouldNotResolveLocationTestCase.java | 59 - .../resource/LocationAttributeMissingTestCase.java | 60 - .../ContributionResolveExceptionTestCase.java | 57 - .../spring/LocationAttributeMissingTestCase.java | 60 - .../UnableToResolveComponentTypeTestCase.java | 60 - .../widget/CouldNotResolveLocationTestCase.java | 59 - .../widget/LocationAttributeMissingTestCase.java | 60 - .../impl/xquery/CouldNotLocateFileTestCase.java | 60 - .../xquery/LocationAttributeMissingTestCase.java | 60 - .../interfacejava/xml/ClassNotFoundTestCase.java | 60 - .../xml/ContributionResolveExceptionTestCase.java | 60 - .../xml/InvalidWSDLInterfaceAttrTestCase.java | 60 - .../xml/WsdlInterfaceDoesNotMatchTestCase.java | 60 - .../xml/AlwaysProvidedIntentNotFoundTestCase.java | 60 - .../xml/ErrorInPolicyIntentDefinitionTestCase.java | 60 - .../policy/xml/IntentNotSpecifiedTestCase.java | 59 - .../xml/MayProvideIntentNotFoundTestCase.java | 60 - .../xml/RequiredAttributeMissingTestCase.java | 60 - .../policy/xml/UnableToMapPoliciesTestCase.java | 65 - .../UnrecognizedIntentAttachPointTypeTestCase.java | 60 - tags/java/sca/1.5.1/itest/wasAdmin.py | 91 -- tags/java/sca/1.5.1/itest/wires/pom.xml | 45 - .../org/apache/tuscany/sca/itest/WireClient.java | 34 - .../apache/tuscany/sca/itest/WireClientImpl.java | 52 - .../org/apache/tuscany/sca/itest/WireService.java | 36 - .../apache/tuscany/sca/itest/WireServiceImpl.java | 39 - .../wires/src/main/resources/WireTest.composite | 39 - .../org/apache/tuscany/sca/itest/WireTestCase.java | 69 - .../java/sca/1.5.1/itest/workspace-manager/pom.xml | 51 - .../org/apache/tuscany/sca/artifact/xyz/XYZ.java | 46 - .../tuscany/sca/artifact/xyz/XYZModelResolver.java | 86 -- .../tuscany/sca/artifact/xyz/XYZProcessor.java | 91 -- .../sca/implementation/xyz/ImplementationXYZ.java | 49 - .../xyz/ImplementationXYZFactory.java | 36 - .../xyz/ImplementationXYZFactoryImpl.java | 33 - .../implementation/xyz/ImplementationXYZImpl.java | 129 -- .../xyz/ImplementationXYZInvoker.java | 54 - .../xyz/ImplementationXYZProcessor.java | 158 --- .../xyz/ImplementationXYZProvider.java | 85 -- .../xyz/ImplementationXYZProviderFactory.java | 43 - .../imprt/xyz/DefaultImportExportXYZFactory.java | 28 - .../apache/tuscany/sca/imprt/xyz/ExportXYZ.java | 60 - .../tuscany/sca/imprt/xyz/ExportXYZImpl.java | 64 - .../sca/imprt/xyz/ExportXYZModelResolver.java | 54 - .../tuscany/sca/imprt/xyz/ExportXYZProcessor.java | 171 --- .../sca/imprt/xyz/ImportExportXYZFactory.java | 27 - .../sca/imprt/xyz/ImportExportXYZFactoryImpl.java | 32 - .../apache/tuscany/sca/imprt/xyz/ImportXYZ.java | 59 - .../tuscany/sca/imprt/xyz/ImportXYZImpl.java | 79 -- .../tuscany/sca/imprt/xyz/ImportXYZProcessor.java | 171 --- .../contrib1/META-INF/sca-contribution.xml | 9 - .../src/main/resources/contrib1/contrib1.composite | 17 - .../contrib2/META-INF/sca-contribution.xml | 9 - .../src/main/resources/contrib2/abcdef.xyz | 1 - .../src/main/resources/contrib2/contrib2.composite | 12 - .../src/main/resources/implementation-xyz.xsd | 24 - .../src/main/resources/import-xyz.xsd | 29 - .../manager/test/WorkspaceManagerTestCase.java | 146 -- .../sca/1.5.1/itest/ws-void-args-return/pom.xml | 61 - .../src/main/java/voidtest/Bean.java | 39 - .../src/main/java/voidtest/HelloWorldImpl.java | 64 - .../src/main/java/voidtest/HelloWorldService.java | 47 - .../src/main/java/voidtest/TestClient.java | 23 - .../src/main/java/voidtest/TestClientImpl.java | 53 - .../src/main/resources/voidtest.composite | 41 - .../test/java/voidtest/VoidArgsReturnTestCase.java | 53 - tags/java/sca/1.5.1/itest/wsdl-multiple/pom.xml | 135 -- .../main/java/helloworld/HelloWorldCallback.java | 30 - .../main/java/helloworld/HelloWorldClientImpl.java | 42 - .../main/java/helloworld/HelloWorldService.java | 32 - .../java/helloworld/HelloWorldServiceImpl.java | 37 - .../src/main/resources/auto-wsdl.composite | 44 - .../src/main/resources/manual-wsdl.composite | 46 - .../wsdl/helloworld.HelloWorldCallback.wsdl | 98 -- .../wsdl/helloworld.HelloWorldService.wsdl | 95 -- .../apache/tuscany/sca/itest/AutoWSDLTestCase.java | 65 - .../tuscany/sca/itest/ManualWSDLTestCase.java | 65 - tags/java/sca/1.5.1/itest/wsdl/pom.xml | 135 -- .../services/accountdata/AccountDataService.java | 92 -- .../accountdata/AccountDataServiceImpl.java | 93 -- .../accountdata/AccountServiceClientImpl.java | 79 -- .../services/accountdata/Component2aImpl.java | 79 -- .../services/accountdata/Component2bImpl.java | 79 -- .../services/accountdata/Component3aImpl.java | 79 -- .../services/accountdata/Component3bImpl.java | 79 -- .../services/accountdata/CustomerIdService.java | 98 -- .../src/main/java/helloworld/HelloWorldImpl.java | 33 - .../main/java/helloworld/HelloWorldService.java | 30 - .../helloworld/HelloWorldServiceComponent.java | 43 - .../apache/tuscany/sca/itest/Component2aImpl.java | 38 - .../apache/tuscany/sca/itest/Component2bImpl.java | 39 - .../apache/tuscany/sca/itest/Component3aImpl.java | 39 - .../apache/tuscany/sca/itest/Component3bImpl.java | 39 - .../resources/META-INF/wsdl/helloworld-import.wsdl | 57 - .../main/resources/META-INF/wsdl/helloworld.xsd | 35 - .../wsdl/src/main/resources/SDOWSDLTest.composite | 344 ----- .../wsdl/src/main/resources/WSDLTest.composite | 371 ----- .../wsdl/META-INF/wsdl/helloworld-import.wsdl | 57 - .../imports/wsdl/META-INF/wsdl/helloworld.xsd | 35 - .../main/resources/imports/wsdl/helloworld.wsdl | 51 - .../resources/imports/wsdl/helloworldws.composite | 33 - .../src/main/resources/wsdl/AccountService.wsdl | 453 ------ .../itest/wsdl/src/main/resources/wsdl/Hello.xsd | 37 - .../wsdl/src/main/resources/wsdl/helloworld.wsdl | 64 - .../apache/tuscany/sca/itest/HelloWorldClient.java | 52 - .../apache/tuscany/sca/itest/SDOWSDLTestCase.java | 169 --- .../tuscany/sca/itest/WSDLImportsTestCase.java | 32 - .../org/apache/tuscany/sca/itest/WSDLTestCase.java | 146 -- tags/java/sca/1.5.1/itest/wsdl2java/pom.xml | 189 --- .../src/test/resources/AccountService.wsdl | 479 ------- .../wsdl2java/src/test/resources/EchoService.wsdl | 64 - .../wsdl2java/src/test/resources/EchoService.xsd | 40 - .../src/test/resources/StockExceptionTest.wsdl | 167 --- tags/java/sca/1.5.1/itest/wsdlgen/pom.xml | 92 -- .../wsdlgen/src/main/java/helloworld/ABean.java | 42 - .../src/main/java/helloworld/HelloWorldImpl.java | 48 - .../main/java/helloworld/HelloWorldService.java | 36 - .../src/main/java/helloworld/package-info.java | 20 - .../main/resources/META-INF/sca-contribution.xml | 23 - .../wsdlgen/src/main/resources/definitions.xml | 66 - .../src/main/resources/helloworld.composite | 71 - .../src/main/resources/wsdl/helloworld.wsdl | 210 --- .../test/java/helloworld/JmsTransportTestCase.java | 121 -- tags/java/sca/1.5.1/itest/wsdlless/pom.xml | 202 --- .../services/accountdata/AccountDataService.java | 95 -- .../accountdata/AccountDataServiceImpl.java | 91 -- .../accountdata/AccountServiceClientImpl.java | 77 -- .../services/accountdata/Component2aImpl.java | 77 -- .../services/accountdata/Component2bImpl.java | 77 -- .../services/accountdata/Component3aImpl.java | 77 -- .../services/accountdata/Component3bImpl.java | 77 -- .../services/accountdata/CustomerIdService.java | 98 -- .../src/main/java/helloworld/HelloWorldImpl.java | 44 - .../main/java/helloworld/HelloWorldService.java | 31 - .../helloworld/HelloWorldServiceComponent.java | 47 - .../apache/tuscany/sca/itest/Component2aImpl.java | 43 - .../apache/tuscany/sca/itest/Component2bImpl.java | 42 - .../apache/tuscany/sca/itest/Component3aImpl.java | 42 - .../apache/tuscany/sca/itest/Component3bImpl.java | 43 - .../wsdlless/src/main/java/service/AnObject.java | 62 - .../src/main/java/service/MoreComplexObject.java | 53 - .../src/main/java/service/SomeService.java | 31 - .../src/main/java/service/SomeServiceImpl.java | 42 - .../src/main/resources/SDOWSDLTest.composite | 321 ----- .../wsdlless/src/main/resources/WSDLTest.composite | 350 ----- .../wsdlless/src/main/resources/some.composite | 33 - .../src/main/resources/wsdl/AccountService.wsdl | 453 ------ .../src/main/resources/wsdl/helloworld.wsdl | 131 -- .../apache/tuscany/sca/itest/SDOWSDLTestCase.java | 173 --- .../org/apache/tuscany/sca/itest/WSDLTestCase.java | 150 -- .../test/java/service/SomeComponentTestCase.java | 82 -- .../src/test/java/service/generated/AnObject.java | 100 -- .../generated/GetUsingMoreComplexObject.java | 79 -- .../GetUsingMoreComplexObjectResponse.java | 79 -- .../java/service/generated/GetUsingString.java | 79 -- .../service/generated/GetUsingStringResponse.java | 79 -- .../java/service/generated/MoreComplexObject.java | 126 -- .../test/java/service/generated/ObjectFactory.java | 141 -- .../test/java/service/generated/SomeService.java | 65 - .../java/service/generated/SomeServiceService.java | 81 -- .../test/java/service/generated/package-info.java | 21 - 2631 files changed, 161770 deletions(-) delete mode 100644 tags/java/sca/1.5.1/itest/atom/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.composite delete mode 100644 tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.xsd delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/client/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyService.java delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/MyClient.composite delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/service/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyService.java delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/MyService.composite delete mode 100644 tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-ws/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/log4j.properties delete mode 100644 tags/java/sca/1.5.1/itest/bpel/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/build-was-integration.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/service3.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/service3.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenarios.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenarios.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenarios.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenarios.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9a.composite delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java delete mode 100644 tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/example.composite delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-api/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-api/src/main/resources/CallBackApiTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-basic/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-complex-type/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite delete mode 100644 tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType delete mode 100644 tags/java/sca/1.5.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-composite-scope/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite delete mode 100644 tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-id/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-id/src/main/resources/CallBackIdClient.composite delete mode 100644 tags/java/sca/1.5.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-multiple-wires/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-separatethread/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddService.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorClient.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorService.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideService.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyService.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractService.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/resources/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType delete mode 100644 tags/java/sca/1.5.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/build-jar.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-classloader/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-folder/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar delete mode 100644 tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar delete mode 100644 tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository3/contribution.zip delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-java/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-java/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-import-export/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar delete mode 100644 tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app.ear delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/Hello.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorClient.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractService.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/resources/ContributionTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar delete mode 100644 tags/java/sca/1.5.1/itest/contribution/src/test/resources/repository/sample-calculator.jar delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationAge.composite delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationUniqueId.composite delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationId.composite delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationLifetime.composite delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversational.composite delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFive.composite delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFour.composite delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioOne.composite delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioSix.composite delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioThree.composite delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioTwo.composite delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/resources/itest_scenario.idl delete mode 100644 tags/java/sca/1.5.1/itest/corba/src/test/resources/scenariofour.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/generate.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Person.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd delete mode 100644 tags/java/sca/1.5.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/config.png delete mode 100644 tags/java/sca/1.5.1/itest/databindings/config.svg delete mode 100644 tags/java/sca/1.5.1/itest/databindings/databinding.png delete mode 100644 tags/java/sca/1.5.1/itest/databindings/databinding.svg delete mode 100644 tags/java/sca/1.5.1/itest/databindings/interop.png delete mode 100644 tags/java/sca/1.5.1/itest/databindings/interop.svg delete mode 100644 tags/java/sca/1.5.1/itest/databindings/interop/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm delete mode 100644 tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm delete mode 100644 tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm delete mode 100644 tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/generate.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxbgen/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite delete mode 100644 tags/java/sca/1.5.1/itest/databindings/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/readme.html delete mode 100644 tags/java/sca/1.5.1/itest/databindings/sdogen/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/sdogen/src/main/resources/generate/generate.xml delete mode 100644 tags/java/sca/1.5.1/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm delete mode 100644 tags/java/sca/1.5.1/itest/distro-license-check/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/distro-license-check/src/test/java/itest/LicenseTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/AddService.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/AddServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/CalculatorService.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/DivideService.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/MultiplyService.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/SubtractService.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionA/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/client/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/java/scatours/client/TestClient.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/client/src/main/resources/client.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/java/domainmgr/DomainManagerBasicTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ClientNode.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/ToursNode.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/cloud/TripsNode.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/domain.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/runtest/src/test/resources/domain/workspace.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/tours/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/goodvaluetrips/Trips.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Bookings.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Checkout.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/ShoppingCart.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/TripBooking.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/java/com/tuscanyscatours/Updates.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/tours/src/main/resources/tours.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/trips/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/TripProvider.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/java/com/goodvaluetrips/Trips.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/basic/trips/src/main/resources/trips.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/client/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyService.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/MyServiceCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/java/callbackclient/TestService.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/client/src/main/resources/client.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/java/callbacktest/TestService.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/java/domainmgr/DomainManagerCallbackTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ClientNode.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/cloud/ServiceNode.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/domain.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/runtest/src/test/resources/domain/workspace.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/service/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyService.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/java/callbackservice/MyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/callback/service/src/main/resources/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/payment/PaymentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/Customer.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerNotFoundException.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistry.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGateway.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/CreditCardPayment.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/Payment.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/payment/src/main/resources/payment.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/runtest/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/java/domainmgr/DomainManagerErrorTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/cloud/PaymentNode.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/domain.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/error/runtest/src/test/resources/domain/workspace.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/payment/PaymentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/Customer.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerNotFoundException.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistry.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/customer/CustomerRegistryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGateway.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/java/scatours/emailgateway/EmailGatewayImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/CreditCardPayment.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/Payment.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/payment/src/main/resources/payment.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/java/domainmgr/DomainManagerTransactionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/cloud/PaymentNode.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/domain.composite delete mode 100644 tags/java/sca/1.5.1/itest/domainmgr/transaction/runtest/src/test/resources/domain/workspace.xml delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/resources/example.composite delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/main/resources/ExceptionTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/extended-api/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java delete mode 100644 tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java delete mode 100644 tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/extended-api/src/main/resources/BasicService.composite delete mode 100644 tags/java/sca/1.5.1/itest/extended-api/src/main/resources/MathService.composite delete mode 100644 tags/java/sca/1.5.1/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/http-jsonrpc/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/bean/TestBean.java delete mode 100644 tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/Echo.java delete mode 100644 tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java delete mode 100644 tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCSmdTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite delete mode 100644 tags/java/sca/1.5.1/itest/implementation-jee-external-ear/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver delete mode 100644 tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory delete mode 100644 tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/main/resources/test.composite delete mode 100644 tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java delete mode 100644 tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/main/resources/InterfacesTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-client/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-client/src/main/resources/default.composite delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-round2-client/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/resources/default.composite delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-service/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl delete mode 100644 tags/java/sca/1.5.1/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml delete mode 100755 tags/java/sca/1.5.1/itest/interop-soap-service/t.bat delete mode 100644 tags/java/sca/1.5.1/itest/java-init-exceptions/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java delete mode 100644 tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java delete mode 100644 tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java delete mode 100644 tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java delete mode 100644 tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/OkImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/java/itest/Service.java delete mode 100644 tags/java/sca/1.5.1/itest/java-init-exceptions/src/main/resources/test.composite delete mode 100644 tags/java/sca/1.5.1/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jaxws/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jaxws/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jaxws/src/main/resources/Payment.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/jaxws/src/main/resources/payment.composite delete mode 100644 tags/java/sca/1.5.1/itest/jaxws/src/test/java/scatours/payment/PaymentTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-args/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-args/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-args/src/main/resources/selectors/selectors.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/simple/client.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/src/main/resources/simple/tempq.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-definitions/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/definitions/definitions.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-definitions/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsobject/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstext/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-noreplyto/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-noreplyto/src/main/resources/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nulls/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-nulls/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-nulls/src/main/resources/nulls.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-oneway-nocf/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-responsecf/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-responsecf/src/main/resources/cf/client.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-responsecf/src/main/resources/cf/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-responsecf/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/main/resources/selectors/selectors.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-topics/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/topics/TopicsClient.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-topics/src/main/resources/topics/TopicsService.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-ttl/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms-ttl/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms-ttl/src/main/resources/ttl.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/defaults/client.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/defaults/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/dynamic/client.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/exceptions/client.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/exceptions/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/external/client.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/external/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/nonSCAclient/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/oneway/OneWayClient.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/oneway/OneWayService.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/policyHeaders/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/properties/properties.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/client.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/mpclient.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/mpservice.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/main/resources/simple/uriclient.composite delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/AddService.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/DivideService.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/oneway/build.xml delete mode 100644 tags/java/sca/1.5.1/itest/oneway/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java delete mode 100644 tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java delete mode 100644 tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite delete mode 100644 tags/java/sca/1.5.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/operation-overloading/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java delete mode 100644 tags/java/sca/1.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java delete mode 100644 tags/java/sca/1.5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java delete mode 100644 tags/java/sca/1.5.1/itest/operation-overloading/src/main/resources/OperationOverload.composite delete mode 100644 tags/java/sca/1.5.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/build-bundles.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties delete mode 100644 tags/java/sca/1.5.1/itest/osgi-contribution/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/build-bundles.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/services/services-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/version/version-test.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/build-bundles.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java delete mode 100644 tags/java/sca/1.5.1/itest/osgi-tuscany/tuscany-versioned/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-basicauth/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/resources/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-basicauth/src/main/resources/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-jsr250/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/resources/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-jsr250/src/main/resources/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-token/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-token/src/main/resources/jndi.properties delete mode 100644 tags/java/sca/1.5.1/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/policy-security/src/main/resources/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy-security/src/main/resources/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/AddService.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/AddServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/CalculatorClient.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/CalculatorService.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/DivideService.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/MultiplyService.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/PolicyQNames.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/SubtractService.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/resources/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/main/resources/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java delete mode 100644 tags/java/sca/1.5.1/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java delete mode 100644 tags/java/sca/1.5.1/itest/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/promotion-interface-missmatch/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java delete mode 100644 tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java delete mode 100644 tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java delete mode 100644 tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/resources/example.composite delete mode 100644 tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd delete mode 100644 tags/java/sca/1.5.1/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/java/test/jaxb/props/package-info.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/resources/Outer.composite delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/resources/OuterPropertyTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/resources/PropertyTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/resources/customer.xsd delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/resources/fileProperty.txt delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/resources/manyValuesFileProperty.txt delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/resources/mySimpleService.composite delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/resources/rcProps.txt delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/main/resources/rcprops.xsd delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-multi-level/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/policy/Target.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/Composer.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerClient.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/java/recursive/ComposerServer.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/Client.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/Inner.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/Outer.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/main/resources/policy/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/circular/include/DemoClass.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/CompositeClient.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/Source.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/SourceCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/SourceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/Target.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/composite/TargetImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/foo/A.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/foo/B.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/foo/I.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/policy/Target.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/policy/TargetClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/policy/TargetServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentAImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentCImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentEImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/ComponentFImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/sample/Service1.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/test/Aggregator.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/test/AggregatorImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/test/InnerSourceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/test/OuterSourceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/test/Source.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/test1/composite/Target.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/test1/composite/TargetOne.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/AComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/BComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/CComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/Composite1.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/Composite2.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/Composite3.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/Demo1Composite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/Demo2Composite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/Inner.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/InnerComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/InnerComposite2.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/Outer.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/OuterComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/foo.png delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o1.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o2.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o3.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/foo/o4.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/policy/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/test1/InnerComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/main/resources/test1/OuterComposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/composite/CompositeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/foo/O2TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/foo/O4TestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/policy/PolicyTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/C.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/CImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/NestedTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/X.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/XImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/Y.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/sample/YImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/test/InnerTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/test/OuterTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/references-collection/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/Crawler.java delete mode 100644 tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/CrawlerController.java delete mode 100644 tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/references-collection/src/main/resources/test.composite delete mode 100644 tags/java/sca/1.5.1/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/references/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/resources/InnerReferencesTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/references/src/main/resources/ManualWiredReferencesTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/scopes/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java delete mode 100644 tags/java/sca/1.5.1/itest/scopes/src/main/resources/scopes.composite delete mode 100644 tags/java/sca/1.5.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/main/resources/nestedcomposite.composite delete mode 100644 tags/java/sca/1.5.1/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/services/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/services/src/main/resources/ServicesTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/AddService.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/AddServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/CalculatorService.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/DivideService.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/MultiplyService.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/SubtractService.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/JaasLoginModule.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/calculator/security/UserPrincipal.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/helloworld/HelloWorldProxy.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestBean.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestBeanImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestHelloWorldBean.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestReference.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestReferenceBean.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/mock/TestSCAPropertyBean.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/context/access/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/context/access/CalculatorService-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/context/multiple/StockQuote.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/implementation/policies/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/location/jar/spring-context.jar delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/spring/annotations/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/context/access/CalculatorClient.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/context/access/ContextAccessTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/context/imports/CalculatorClient.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/context/multiple/StockQuoteServer.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/implementation/policies/CalculatorClient.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/spring/annotations/CalculatorClient.java delete mode 100644 tags/java/sca/1.5.1/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/transaction/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/resources/accounts.composite delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/resources/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/main/resources/log4j.properties delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/account/Customer.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/calculator/AddService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/binding/jms/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/AddService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/CalculatorClient.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/CalculatorService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/DivideService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/MultiplyService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/PropertyService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/SubtractService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/AddService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/AddServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/CalculatorClient.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/CalculatorService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/DivideService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/DivideServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/MultiplyService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/SubtractService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/spring/HelloWorld.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/XsdValidation/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/ContributionReadException.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/domain/CustomCompositeBuilder.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wasAdmin.py delete mode 100644 tags/java/sca/1.5.1/itest/wires/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java delete mode 100644 tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java delete mode 100644 tags/java/sca/1.5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wires/src/main/resources/WireTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZ.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZModelResolver.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/artifact/xyz/XYZProcessor.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZ.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZFactoryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZInvoker.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProcessor.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProvider.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/implementation/xyz/ImplementationXYZProviderFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/DefaultImportExportXYZFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZ.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZModelResolver.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ExportXYZProcessor.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportExportXYZFactoryImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZ.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/imprt/xyz/ImportXYZProcessor.java delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib1/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib1/contrib1.composite delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/abcdef.xyz delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/contrib2/contrib2.composite delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/implementation-xyz.xsd delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/main/resources/import-xyz.xsd delete mode 100644 tags/java/sca/1.5.1/itest/workspace-manager/src/test/java/org/apache/tuscany/sca/workspace/manager/test/WorkspaceManagerTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/ws-void-args-return/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/Bean.java delete mode 100644 tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java delete mode 100644 tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/ws-void-args-return/src/main/resources/voidtest.composite delete mode 100644 tags/java/sca/1.5.1/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld-import.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/META-INF/wsdl/helloworld.xsd delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/SDOWSDLTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/WSDLTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld-import.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/META-INF/wsdl/helloworld.xsd delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/imports/wsdl/helloworldws.composite delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/Hello.xsd delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/HelloWorldClient.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLImportsTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdl2java/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/AccountService.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/EchoService.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/EchoService.xsd delete mode 100644 tags/java/sca/1.5.1/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdlgen/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/ABean.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlgen/src/main/java/helloworld/package-info.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/definitions.xml delete mode 100644 tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/helloworld.composite delete mode 100644 tags/java/sca/1.5.1/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/pom.xml delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/AnObject.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/MoreComplexObject.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/SomeService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/java/service/SomeServiceImpl.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/SDOWSDLTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/WSDLTest.composite delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/some.composite delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/AnObject.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingString.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/SomeService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java delete mode 100644 tags/java/sca/1.5.1/itest/wsdlless/src/test/java/service/generated/package-info.java (limited to 'tags/java/sca/1.5.1/itest') diff --git a/tags/java/sca/1.5.1/itest/atom/pom.xml b/tags/java/sca/1.5.1/itest/atom/pom.xml deleted file mode 100644 index 0b65205d77..0000000000 --- a/tags/java/sca/1.5.1/itest/atom/pom.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-atom - Apache Tuscany SCA iTest Atom Binding - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-interface-wsdl-xml - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-atom-abdera - 1.5.1 - runtime - - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - - org.apache.tuscany.sdo - tuscany-sdo-impl - 1.1.1 - - - - junit - junit - 4.5 - test - - - - - ${artifactId} - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Djava.endorsed.dirs=target/endorsed - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - generate-sources - - copy - - - - - javax.xml.ws - jaxws-api - 2.1 - jar - - - javax.xml.bind - jaxb-api - 2.1 - jar - - - ${project.build.directory}/endorsed - false - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.0 - - - add-test-source - generate-sources - - add-test-source - - - - target/jaxws-source - - - - - - - org.codehaus.mojo - jaxws-maven-plugin - 1.12 - - - - javax.jws - jsr181-api - 1.0-MR1 - - - javax.annotation - jsr250-api - 1.0 - - - - - wsimport - generate-sources - - wsimport - - - test.abdera - ${basedir}/src/test/resources/news - - news.wsdl - - ${project.build.directory}/jaxws-source - false - true - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java b/tags/java/sca/1.5.1/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java deleted file mode 100644 index 09789b4bb5..0000000000 --- a/tags/java/sca/1.5.1/itest/atom/src/main/java/test/abdera/impl/NewsServiceImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -package test.abdera.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.osoa.sca.annotations.Init; - -import test.abdera.Entry; -import test.abdera.Item; -import test.abdera.NewsService; -import test.abdera.NotFoundException_Exception; - -public class NewsServiceImpl implements NewsService { - private static Map collection = new HashMap(); - - @Init - public void init() { - Item item = new Item(); - item.setName("Item Name 01"); - item.setTitle("Item title 01"); - - Entry entry = new Entry(); - entry.setKey("1"); - entry.setData(item); - - collection.put((String)entry.getKey(), entry); - } - - public List getAll() { - List entries = new ArrayList(); - for(Entry entry : collection.values()) { - entries.add(entry); - } - return entries; - } - - public Item get(String arg0) throws NotFoundException_Exception { - return (Item) collection.get(arg0).getData(); - } - - public String post(String arg0, Item arg1) { - // TODO Auto-generated method stub - return null; - } - - public void put(String arg0, Item arg1) throws NotFoundException_Exception { - // TODO Auto-generated method stub - - } - - public void delete(String arg0) throws NotFoundException_Exception { - // TODO Auto-generated method stub - - } - - public List query(String arg0) { - // TODO Auto-generated method stub - return null; - } - -} diff --git a/tags/java/sca/1.5.1/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java b/tags/java/sca/1.5.1/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java deleted file mode 100644 index b9f2b4e2fc..0000000000 --- a/tags/java/sca/1.5.1/itest/atom/src/test/java/test/abdera/NewsServiceTestCase.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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 test.abdera; - -import java.net.Socket; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -public class NewsServiceTestCase { - private static SCADomain domain; - private static NewsService newsService; - - @BeforeClass - public static void init() throws Exception { - domain = SCADomain.newInstance("news/news.composite"); - Assert.assertNotNull(domain); - newsService = domain.getService(NewsService.class, "NewsServiceComponent"); - Assert.assertNotNull(newsService); - } - - @AfterClass - public static void destroy() throws Exception { - if(domain != null) { - domain.close(); - } - } - - @Test - public void testPing() throws Exception { - new Socket("127.0.0.1", 8085); - //System.in.read(); - } - - @Test - public void testNewsServicesGet() throws Exception { - Item item = newsService.get("1"); - - Assert.assertNotNull(item); - System.out.println(">>> Entry - " + item.getTitle()); - } -} diff --git a/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.composite b/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.composite deleted file mode 100644 index f3a3b165cc..0000000000 --- a/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.wsdl b/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.wsdl deleted file mode 100644 index 62d46e66c9..0000000000 --- a/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.wsdl +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.xsd b/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.xsd deleted file mode 100644 index 0a59f9311e..0000000000 --- a/tags/java/sca/1.5.1/itest/atom/src/test/resources/news/news.xsd +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/pom.xml b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/pom.xml deleted file mode 100644 index 41aca24eb0..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-binidng-sca-jms - 1.5.1 - ../../pom.xml - - itest-binding-sca-jms-client - - - - org.apache.tuscany.sca - tuscany-node-impl - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-sca-jms - 1.5.1 - runtime - - - - junit - junit - 4.2 - test - - - - - ${artifactId} - - - diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java deleted file mode 100644 index d1b4ecbd15..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 itest; - -import org.osoa.sca.annotations.Reference; - -public class MyClientImpl implements MyService { - - @Reference public MyService delegate; - - public String sayHello(String s) { - return "Hi " + delegate.sayHello(s); - } - -} diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyService.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyService.java deleted file mode 100644 index e5123f087c..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/java/itest/MyService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 itest; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface MyService { - - String sayHello(String s); -} diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 8c311553c3..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/MyClient.composite b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/MyClient.composite deleted file mode 100644 index 81aa3ed98d..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/main/resources/MyClient.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java deleted file mode 100644 index d28d4a51b5..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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 itest; - - - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.Test; - -/** - * Runs a distributed domain in a single VM by using and in memory - * implementation of the distributed domain - */ -public class MyClientTestCase { - - @Test - public void testCalculator() throws Exception { - - SCANode serviceNode = SCANodeFactory.newInstance().createSCANode("MyService.composite", new SCAContribution("bla2", "../service/target/itest-binding-sca-jms-service.jar")); - - SCANode clientNode = SCANodeFactory.newInstance().createSCANodeFromClassLoader("MyClient.composite", null); - try { - - serviceNode.start(); - clientNode.start(); - - MyService service = ((SCAClient)clientNode).getService(MyService.class, "MyClientComponent"); - - Assert.assertEquals("Hi Hello petra", service.sayHello("petra")); - - } finally { - clientNode.stop(); - serviceNode.stop(); - } - } -} diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/pom.xml b/tags/java/sca/1.5.1/itest/binding-sca-jms/pom.xml deleted file mode 100644 index 4bac4fd856..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-binidng-sca-jms - pom - Apache Tuscany SCA JMS SCA Binding Integration Tests - - - service - client - - diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/pom.xml b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/pom.xml deleted file mode 100644 index 5c5e5b8db5..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-binidng-sca-jms - 1.5.1 - ../../pom.xml - - itest-binding-sca-jms-service - - - - org.apache.tuscany.sca - tuscany-node-impl - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-sca-jms - 1.5.1 - runtime - - - - junit - junit - 4.2 - test - - - - - ${artifactId} - - - diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyService.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyService.java deleted file mode 100644 index e5123f087c..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 itest; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface MyService { - - String sayHello(String s); -} diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java deleted file mode 100644 index d0f8dcc393..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 itest; - -public class MyServiceImpl implements MyService { - - public String sayHello(String s) { - return "Hello " + s; - } - -} diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 8c311553c3..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/MyService.composite b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/MyService.composite deleted file mode 100644 index 03ac786809..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/main/resources/MyService.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java b/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java deleted file mode 100644 index 3ec979065d..0000000000 --- a/tags/java/sca/1.5.1/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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 itest; - - - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.Test; - -/** - * Runs a distributed domain in a single VM by using and in memory - * implementation of the distributed domain - */ -public class MyServiceTestCase { - - @Test - public void testCalculator() throws Exception { - - SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("MyService.composite", null); - try { - - node.start(); - - MyService service = ((SCAClient)node).getService(MyService.class, "MyServiceComponent"); - - Assert.assertEquals("Hello petra", service.sayHello("petra")); - - } finally { - node.stop(); - } - } -} diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/pom.xml b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/pom.xml deleted file mode 100644 index 1b41897611..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/pom.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-bpel - 1.5.1 - ../../pom.xml - - itest-bpel-helloworld-reference - Apache Tuscany SCA iTest HelloWorld Reference BPEL - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-bpel-ode - 1.5.1 - runtime - - - - org.apache.ode - ode-dao-jpa-ojpa-derby - 1.1 - zip - - - - org.apache.tuscany.sdo - tuscany-sdo-impl - 1.1.1 - - - - xerces - xercesImpl - 2.8.0 - - - - junit - junit - 4.5 - test - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-surefire-plugin - - 2.3.1 - - false - false - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - generate-sources - - unpack - - - - - org.apache.ode - ode-dao-jpa-ojpa-derby - 1.1 - zip - true - ${project.build.directory}/test-classes/ - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java deleted file mode 100644 index 532b84bd22..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 greetings; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface GreetingsService { - - public String getGreetings(String name); -} - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java deleted file mode 100644 index 86d7f245e8..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 greetings; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(GreetingsService.class) -public class GreetingsServiceImpl implements GreetingsService { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java deleted file mode 100644 index 8dea2715bf..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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 greetings; - -import java.io.IOException; -import java.net.Socket; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * Tests the Greetings service - * - * @version $Rev$ $Date$ - */ -public class GreetingsTestCase extends TestCase { - - private SCADomain scaDomain; - GreetingsService greetingsService = null; - - /** - * @throws java.lang.Exception - */ - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("greetings/greetings.composite"); - greetingsService = scaDomain.getService(GreetingsService.class, "GreetingsServiceComponent"); - } - - /** - * @throws java.lang.Exception - */ - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void testInvoke() { - String response = greetingsService.getGreetings("Luciano"); - assertEquals("Hello Luciano", response); - } -} diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java deleted file mode 100644 index 672dbdc0b5..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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 helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for the helloworld service - */ -@Remotable -public interface HelloWorldService { - public String hello(String name); -} diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index d7ebd5cbb8..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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 helloworld; - -import greetings.GreetingsService; - -import org.osoa.sca.annotations.Reference; - -/** - * The HelloWorld service implementation - */ -public class HelloWorldServiceImpl implements HelloWorldService { - - protected GreetingsService greetingsService; - - public GreetingsService getGreetingsService() { - System.out.println("Got Injected greetingsService"); - return greetingsService; - } - - @Reference - public void setGreetingsService(GreetingsService greetingsService) { - System.out.println("Injected greetingsService"); - this.greetingsService = greetingsService; - } - - public String hello(String name) { - System.out.println("Calling greeting services getGreetings"); - return greetingsService.getGreetings(name); - } -} \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java deleted file mode 100644 index bdfedee2f8..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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 helloworld; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * Tests the BPEL Helloworld Service - * - * @version $Rev$ $Date$ - */ -public class HelloWorldTestCase extends TestCase { - private SCADomain scaDomain; - - /** - * @throws java.lang.Exception - */ - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("helloworld/helloworld.composite"); - } - - /** - * @throws java.lang.Exception - */ - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void testServiceInvocation() { - HelloWorldService bpelService = scaDomain.getService(HelloWorldService.class, "HelloWorldService"); - String response = bpelService.hello("Luciano"); - assertEquals("Hello Luciano", response); - } -} diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite deleted file mode 100644 index dfec43e8e1..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl deleted file mode 100644 index e768707ccd..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel deleted file mode 100644 index 5ec2cc9f2e..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - $helloMessage.TestPart - $greetingsRequest.parameters - - - - - - - - $greetingsResponse.parameters/greetings:getGreetingsReturn - $helloResponse.TestPart - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite deleted file mode 100644 index 504e2ccc5d..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl deleted file mode 100644 index 0f51b96b27..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties deleted file mode 100644 index 4e13380e0b..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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. -# - -# Set root logger level to WARN and its only appender to CONSOLE -log4j.rootLogger=OFF, CONSOLE - -# log4j properties to work with commandline tools. -log4j.category.org.mortbay=OFF -log4j.category.org.hibernate.type=OFF -log4j.category.org.objectweb=OFF -log4j.category.org.apache.ode.axis2=OFF -log4j.category.org.apache.ode.bpel.engine=OFF -log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF -log4j.category.org.apache.ode.bpel.epr=OFF -log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG - -# Console appender -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/pom.xml b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/pom.xml deleted file mode 100644 index 480b90fac4..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/pom.xml +++ /dev/null @@ -1,176 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-bpel - 1.5.1 - ../../pom.xml - - itest-bpel-helloworld-ws - Apache Tuscany SCA iTest HelloWorld BPEL Over Web Services - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-bpel-ode - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - runtime - - - - org.apache.tuscany.sdo - tuscany-sdo-impl - 1.1.1 - - - - xerces - xercesImpl - 2.8.1 - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - - junit - junit - 4.5 - test - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-surefire-plugin - - 2.3.1 - - false - false - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - test-compile - - unpack - - - - - org.apache.ode - ode-dao-jpa-ojpa-derby - 1.1 - zip - true - ${project.build.directory}/test-classes/ - - - - - - - - org.apache.tuscany.sdo - tuscany-sdo-plugin - 1.1.1 - - - generate-bpel-helloworld - generate-sources - - ${basedir}/src/test/resources/helloworld/helloworld.wsdl - ${basedir}/target/wsdl2java-source - HelloWorld - true - true - true - - - generate - - - - - - org.apache.tuscany.sca - tuscany-maven-wsdl2java - 1.5.1 - - - - - - ${basedir}/src/test/resources/helloworld/helloworld.wsdl - - - - - generate - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java deleted file mode 100644 index ffdbc50a22..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 helloworld; - -import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - */ -public class HelloWorld { - private HelloPortType helloService; - - public HelloWorld() { - super(); - } - - @Reference - public void setHelloService(HelloPortType helloService){ - this.helloService = helloService; - } - - public String hello(String hello) throws java.rmi.RemoteException { - System.out.println(">>> Invoking helloService.hello with : " + hello); - return this.helloService.hello(hello); - } - -} diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java deleted file mode 100644 index 6971151a77..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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 helloworld; - -import java.io.IOException; -import java.net.Socket; - -import junit.framework.TestCase; - -import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * Tests the BPEL Helloworld Service - * - * @version $Rev$ $Date$ - */ -public class HelloWorldTestCase extends TestCase { - - private SCADomain scaDomain; - - /** - * @throws java.lang.Exception - */ - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("helloworld/helloworld.composite"); - } - - /** - * @throws java.lang.Exception - */ - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - public void testServiceInvocation() throws Exception { - HelloPortType bpelService = scaDomain.getService(HelloPortType.class, "BPELHelloWorldServiceComponent"); - String response = bpelService.hello("Hello"); - assertEquals("Hello World", response); - } -} diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel deleted file mode 100644 index 8cf91adc2c..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - concat($tmpVar,' World') - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite deleted file mode 100644 index f864f45613..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl deleted file mode 100644 index 610bda3cc4..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties deleted file mode 100644 index 37f66e4189..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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. -# - -# Set root logger level to WARN and its only appender to CONSOLE -log4j.rootLogger=OFF, CONSOLE - -# log4j properties to work with commandline tools. -log4j.category.org.mortbay=OFF -log4j.category.org.hibernate.type=OFF -log4j.category.org.objectweb=OFF -log4j.category.org.apache.ode.axis2=OFF -log4j.category.org.apache.ode.bpel.engine=OFF -log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF -log4j.category.org.apache.ode.bpel.epr=OFF -log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG - -# Console appender -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld/pom.xml b/tags/java/sca/1.5.1/itest/bpel/helloworld/pom.xml deleted file mode 100644 index 3c080a44b5..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld/pom.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - itest-bpel - 1.5.1 - ../../pom.xml - - itest-bpel-helloworld - Apache Tuscany SCA iTest HelloWorld BPEL - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-bpel-ode - 1.5.1 - runtime - - - - org.apache.tuscany.sdo - tuscany-sdo-impl - 1.1.1 - - - - xerces - xercesImpl - 2.8.1 - - - - junit - junit - 4.5 - test - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-surefire-plugin - - 2.3.1 - - false - false - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - test-compile - - unpack - - - - - org.apache.ode - ode-dao-jpa-ojpa-derby - 1.1 - zip - true - ${project.build.directory}/test-classes/ - - - - - - - - org.apache.tuscany.sdo - tuscany-sdo-plugin - 1.1.1 - - - generate-bpel-helloworld - generate-sources - - ${basedir}/src/test/resources/helloworld/helloworld.wsdl - ${basedir}/target/wsdl2java-source - HelloWorld - true - true - true - - - generate - - - - - - org.apache.tuscany.sca - tuscany-maven-wsdl2java - 1.5.1 - - - - - - ${basedir}/src/test/resources/helloworld/helloworld.wsdl - - - - - generate - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java deleted file mode 100644 index ffdbc50a22..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 helloworld; - -import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - */ -public class HelloWorld { - private HelloPortType helloService; - - public HelloWorld() { - super(); - } - - @Reference - public void setHelloService(HelloPortType helloService){ - this.helloService = helloService; - } - - public String hello(String hello) throws java.rmi.RemoteException { - System.out.println(">>> Invoking helloService.hello with : " + hello); - return this.helloService.hello(hello); - } - -} diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java deleted file mode 100644 index 76fcd35c2d..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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 helloworld; - -import junit.framework.TestCase; - -import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * Tests the BPEL Helloworld Service - * - * @version $Rev$ $Date$ - */ -public class HelloWorldTestCase extends TestCase { - - private SCADomain scaDomain; - - /** - * @throws java.lang.Exception - */ - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("helloworld/helloworld.composite"); - } - - /** - * @throws java.lang.Exception - */ - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void testServiceInvocation() throws Exception { - HelloPortType bpelService = scaDomain.getService(HelloPortType.class, "BPELHelloWorldService"); - String response = bpelService.hello("Hello"); - assertEquals("Hello World", response); - } - - public void testReferenceInvocation() throws Exception { - HelloWorld bpelService = scaDomain.getService(HelloWorld.class, "BPELHelloWorld"); - String response = bpelService.hello("Hello"); - assertEquals("Hello World", response); - } -} diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel deleted file mode 100644 index 8cf91adc2c..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - concat($tmpVar,' World') - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite deleted file mode 100644 index f6b12fb14b..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl deleted file mode 100644 index 610bda3cc4..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/log4j.properties b/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/log4j.properties deleted file mode 100644 index 37f66e4189..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/helloworld/src/test/resources/log4j.properties +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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. -# - -# Set root logger level to WARN and its only appender to CONSOLE -log4j.rootLogger=OFF, CONSOLE - -# log4j properties to work with commandline tools. -log4j.category.org.mortbay=OFF -log4j.category.org.hibernate.type=OFF -log4j.category.org.objectweb=OFF -log4j.category.org.apache.ode.axis2=OFF -log4j.category.org.apache.ode.bpel.engine=OFF -log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF -log4j.category.org.apache.ode.bpel.epr=OFF -log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG - -# Console appender -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n diff --git a/tags/java/sca/1.5.1/itest/bpel/pom.xml b/tags/java/sca/1.5.1/itest/bpel/pom.xml deleted file mode 100644 index 65750b6860..0000000000 --- a/tags/java/sca/1.5.1/itest/bpel/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-bpel - pom - Apache Tuscany SCA BPEL Integration Tests - - - helloworld - helloworld-ws - helloworld-reference - - diff --git a/tags/java/sca/1.5.1/itest/build-was-integration.xml b/tags/java/sca/1.5.1/itest/build-was-integration.xml deleted file mode 100644 index 03de4c050f..0000000000 --- a/tags/java/sca/1.5.1/itest/build-was-integration.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - Installing war ${application.war} on ${application.server} using name ${application.name} and context root ${application.contextRoot} - - - - - Starting application ${application.name} on ${application.server} - - - - - - - Uninstalling ${application.name} - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/pom.xml b/tags/java/sca/1.5.1/itest/builder/pom.xml deleted file mode 100644 index bdcdf844f5..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-builder - Apache Tuscany SCA iTest Builder - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-monitor - 1.5.1 - test - - - - org.apache.tuscany.sca - tuscany-workspace-impl - 1.5.1 - test - - - - org.apache.tuscany.sca - tuscany-binding-ws-xml - 1.5.1 - test - - - - org.apache.tuscany.sca - tuscany-binding-sca-xml - 1.5.1 - test - - - - org.apache.tuscany.sca - tuscany-assembly - 1.5.1 - test - - - - org.apache.tuscany.sca - tuscany-core-databinding - 1.5.1 - test - - - - xerces - xercesImpl - 2.8.1 - test - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java deleted file mode 100644 index 932ae3987a..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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.builder; - -import java.util.List; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * Implementation class for ComponentD. - * - * @version $Rev$ $Date$ - */ -@Service(interfaces={Service3.class, Service3a.class}) -public class ComponentDImpl implements Service3, Service3a { - - @Reference - protected Service3a reference3; - - public String getGreetings(String name) { - return "Hello, " + name + "!"; - } - - public String getGreetings2(String name) { - return "Goodbye, " + name + "!"; - } - -} diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java deleted file mode 100644 index f9ef0a1b4f..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.builder; - -import java.util.List; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * Implementation class for ComponentD. - * - * @version $Rev: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $ - */ -@Service(interfaces={Service3.class, Service3a.class}) -public class ComponentDReferenceMultiplicityImpl implements Service3, Service3a { - - @Reference - protected Service3a reference3; - - @Reference - protected List reference3a; - - public String getGreetings(String name) { - return "Hello, " + name + "!"; - } - - public String getGreetings2(String name) { - return "Goodbye, " + name + "!"; - } - -} diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java deleted file mode 100644 index c041a76b47..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.builder; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * Implementation class for ComponentD. - * - * @version $Rev: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $ - */ -@Service(interfaces={Service3.class}) -public class ComponentEImpl implements Service3 { - - - public String getGreetings(String name) { - return "Hello, " + name + " from ComponentE"; - } -} diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java deleted file mode 100644 index ccfeff0997..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.builder; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * Implementation class for ComponentD. - * - * @version $Rev: 678875 $ $Date: 2008-07-22 21:01:07 +0100 (Tue, 22 Jul 2008) $ - */ -@Service(interfaces={Service3.class}) -public class ComponentFImpl implements Service3 { - - - public String getGreetings(String name) { - return "Hello, " + name + " from ComponentF"; - } -} diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java deleted file mode 100644 index 9a775feec9..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.builder; - -import org.osoa.sca.annotations.Remotable; - -/** - * Interface for Service3 in ComponentD. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface Service3 { - - String getGreetings(String name); - -} diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java deleted file mode 100644 index 98a1741fb6..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.builder; - -import org.osoa.sca.annotations.Remotable; - -/** - * Interface for Service3a in ComponentD. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface Service3a { - - String getGreetings2(String name); - -} diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml deleted file mode 100644 index 256d01be58..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1.composite deleted file mode 100644 index 5c2a98ab40..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1a.composite deleted file mode 100644 index 21b5897aa1..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario1/scenario1a.composite +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml deleted file mode 100644 index 083079ba42..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10.composite deleted file mode 100644 index c24b7f0046..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10.composite +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10a.composite deleted file mode 100644 index 27a73d5c41..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/scenario10a.composite +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/service3.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/service3.wsdl deleted file mode 100644 index 14edcc00e6..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario10/service3.wsdl +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml deleted file mode 100644 index a6e4b65970..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11.composite deleted file mode 100644 index 3a94152e6a..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11.composite +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11a.composite deleted file mode 100644 index 6130c68651..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/scenario11a.composite +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/service3.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/service3.wsdl deleted file mode 100644 index 14edcc00e6..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario11/service3.wsdl +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml deleted file mode 100644 index 125bdc5e53..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12.composite deleted file mode 100644 index aabd445e23..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12.composite +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12a.composite deleted file mode 100644 index a2ccc47c28..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario12/scenario12a.composite +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml deleted file mode 100644 index c906c6c5b0..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13.composite deleted file mode 100644 index ed59cd2adf..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13.composite +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13a.composite deleted file mode 100644 index 41150f78fd..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario13/scenario13a.composite +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml deleted file mode 100644 index 6fa901c4df..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2.composite deleted file mode 100644 index 66f88294ff..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2a.composite deleted file mode 100644 index db1af4743f..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario2/scenario2a.composite +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml deleted file mode 100644 index f5899ab1f0..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3.composite deleted file mode 100644 index 4b37c19e4e..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3.composite +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3a.composite deleted file mode 100644 index fedd79ff3d..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario3/scenario3a.composite +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml deleted file mode 100644 index 642245ea7e..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4.composite deleted file mode 100644 index 1bb876b33d..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4.composite +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4a.composite deleted file mode 100644 index 55e13700a6..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario4/scenario4a.composite +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml deleted file mode 100644 index 92da17179f..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5.composite deleted file mode 100644 index 403e19b087..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5.composite +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5a.composite deleted file mode 100644 index 0e37ded0e4..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenario5a.composite +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenarios.wsdl deleted file mode 100644 index 7480419231..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario5/scenarios.wsdl +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml deleted file mode 100644 index 42d45b0b98..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6.composite deleted file mode 100644 index 1c89139905..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6.composite +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6a.composite deleted file mode 100644 index 853703a353..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenario6a.composite +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenarios.wsdl deleted file mode 100644 index 7480419231..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario6/scenarios.wsdl +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml deleted file mode 100644 index 44c471cc65..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7.composite deleted file mode 100644 index 6b1ac24cec..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7a.composite deleted file mode 100644 index 8e0cebbdd5..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenario7a.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenarios.wsdl deleted file mode 100644 index 7480419231..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario7/scenarios.wsdl +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml deleted file mode 100644 index 7cb09d0a74..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8.composite deleted file mode 100644 index 26e5ee33fa..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8.composite +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8a.composite deleted file mode 100644 index 4fa0712199..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenario8a.composite +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenarios.wsdl deleted file mode 100644 index 7480419231..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario8/scenarios.wsdl +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml deleted file mode 100644 index 6e0908702b..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9.composite deleted file mode 100644 index 3fce35470e..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9.composite +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9a.composite b/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9a.composite deleted file mode 100644 index 6e86c547b3..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/main/resources/scenario9/scenario9a.composite +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java deleted file mode 100644 index 1f45cb4a66..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java +++ /dev/null @@ -1,805 +0,0 @@ -/* - * 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.builder; - -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.xml.namespace.QName; -import junit.framework.TestCase; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentReference; -import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract; -import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract; - -/** - * Load and build some composites and inspect the results. - * - * @version $Rev$ $Date$ - */ -public class BuilderTestCase extends TestCase { - private CustomCompositeBuilder customBuilder; - - @Override - protected void setUp() throws Exception { - } - - @Override - protected void tearDown() throws Exception { - } - - - // Scenario 1: on outer composite service CompositeA/Service1 - public void testScenario1() throws Exception { - System.out.println("====>Running testScenario1"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario1.composite", "TestContribution", "src/main/resources/scenario1/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario1Results(false); - } - - public void testScenario1NonWiring() throws Exception { - System.out.println("====>Running testScenario1NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario1.composite", "TestContribution", "src/main/resources/scenario1/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario1Results(true); - } - - private void checkScenario1Results(boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - if (!nonWiring) { - // Should create component service $promoted$Service1 on innermost component - // ComponentD, with and uri="/Service1" - // No other services on ComponentD should have - WebServiceBinding wsBinding = null; - for (ComponentService service : componentD.getServices()) { - WebServiceBinding wsb = service.getBinding(WebServiceBinding.class); - if ("$promoted$Service1".equals(service.getName())) { - wsBinding = wsb; - } else { - assert wsb == null; - } - } - assert "/Service1".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1" - Definition def = wsBinding.getWSDLDocument(); - javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - Port port = svc.getPort("Service3Port"); - assert "/Service1".equals(TestUtils.getPortAddress(port)); - } else { - // Should not create component service $promoted$Service1 on innermost component ComponentD - // No component services on ComponentD should have - for (ComponentService service : componentD.getServices()) { - assert !"$promoted$Service1".equals(service.getName()); - assert service.getBinding(WebServiceBinding.class) == null; - } - } - - // No services on ComponentB should have - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - for (ComponentService service : componentB.getServices()) { - assert service.getBinding(WebServiceBinding.class) == null; - } - - // No services on CompositeC should have - Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario1", "CompositeC")); - for (Service service : compositeC.getServices()) { - assert service.getBinding(WebServiceBinding.class) == null; - } - - if (nonWiring) { - // Should not add a WSDL document to domain composite service Service1 - WebServiceBinding wsBinding = null; - for (Service service : domainComposite.getServices()) { - if ("Service1".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert wsBinding.getWSDLDocument() == null; - } - } - - // Scenario 2: on outer component service ComponentB/Service2 - public void testScenario2() throws Exception { - System.out.println("====>Running testScenario2"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario2.composite", "TestContribution", "src/main/resources/scenario2/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario2and3Results("http://scenario2", false); - } - - public void testScenario2NonWiring() throws Exception { - System.out.println("====>Running testScenario2NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario2.composite", "TestContribution", "src/main/resources/scenario2/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario2and3Results("http://scenario2", true); - } - - private void checkScenario2and3Results(String namespace, boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - // Should create WSDL document for ComponentB/Service2 with endpoint uri="/ComponentB/Service2" - // No other services on ComponentB should have - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - WebServiceBinding wsBinding = null; - for (ComponentService service : componentB.getServices()) { - WebServiceBinding wsb = service.getBinding(WebServiceBinding.class); - if ("Service2".equals(service.getName())) { - wsBinding = wsb; - } else { - assert wsb == null; - } - } - Definition def = wsBinding.getWSDLDocument(); - javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - Port port = svc.getPort("Service3Port"); - assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port)); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - if (!nonWiring) { - // Should create component service $promoted$ComponentB$slash$Service2 on innermost component - // ComponentD, with and uri="/ComponentB/Service2" - wsBinding = null; - for (ComponentService service : componentD.getServices()) { - if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert "/ComponentB/Service2".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - port = svc.getPort("Service3Port"); - assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port)); - } else { - // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD - for (ComponentService service : componentD.getServices()) { - assert !"$promoted$ComponentB$slash$Service2".equals(service.getName()); - } - } - - // Should add to outer composite service CompositeA/Service1 - wsBinding = null; - for (Service service : domainComposite.getServices()) { - if ("Service1".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert wsBinding != null; - if (nonWiring) { - // Should not add a WSDL document to domain composite service Service1 - assert wsBinding.getWSDLDocument() == null; - } - - if (!nonWiring) { - // Should create component service $promoted$Service1 on innermost component - // ComponentD, with and uri="/Service1" - wsBinding = null; - for (ComponentService service : componentD.getServices()) { - if ("$promoted$Service1".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert "/Service1".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - port = svc.getPort("Service3Port"); - assert "/Service1".equals(TestUtils.getPortAddress(port)); - } else { - // Should not create component service $promoted$.Service1 on innermost component ComponentD - for (ComponentService service : componentD.getServices()) { - assert !"$promoted$Service1".equals(service.getName()); - } - } - - // No services on ComponentD should have , except for $promoted$Service1 - // and $promoted$ComponentB$slash$Service2 - for (ComponentService service : componentD.getServices()) { - if (!"$promoted$Service1".equals(service.getName()) && - !"$promoted$ComponentB$slash$Service2".equals(service.getName())) { - assert service.getBinding(WebServiceBinding.class) == null; - } - } - - // No services on CompositeC should have , except for Service2 in Scenario 3 - Composite compositeC = TestUtils.getComposite(domainComposite, new QName(namespace, "CompositeC")); - for (Service service : compositeC.getServices()) { - if ("http://scenario3".equals(namespace) && "Service2".equals(service.getName())) { - assert service.getBinding(WebServiceBinding.class) != null; - } else { - assert service.getBinding(WebServiceBinding.class) == null; - } - } - } - - // Scenario 3: on inner composite service CompositeC/Service2 - public void testScenario3() throws Exception { - System.out.println("====>Running testScenario3"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario3.composite", "TestContribution", "src/main/resources/scenario3/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario2and3Results("http://scenario3", false); - } - - public void testScenario3NonWiring() throws Exception { - System.out.println("====>Running testScenario3NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario3.composite", "TestContribution", "src/main/resources/scenario3/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario2and3Results("http://scenario3", true); - } - - // Scenario 4: on inner component service ComponentD/Service3 - public void testScenario4() throws Exception { - System.out.println("====>Running testScenario4"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario4.composite", "TestContribution", "src/main/resources/scenario4/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario4Results(false); - } - - public void testScenario4NonWiring() throws Exception { - System.out.println("====>Running testScenario4NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario4.composite", "TestContribution", "src/main/resources/scenario4/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario4Results(true); - } - - private void checkScenario4Results(boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - // Should create WSDL document for ComponentD/Service3 with endpoint uri="/ComponentD/Service3" - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - WebServiceBinding wsBinding = null; - for (ComponentService service : componentD.getServices()) { - if ("Service3".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - Definition def = wsBinding.getWSDLDocument(); - javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - Port port = svc.getPort("Service3Port"); - assert "/ComponentB/ComponentD/Service3".equals(TestUtils.getPortAddress(port)); - - // Should add to inner composite service CompositeC/Service2 - // No other services on CompositeC should have - Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario4", "CompositeC")); - wsBinding = null; - for (Service service : compositeC.getServices()) { - WebServiceBinding wsb = service.getBinding(WebServiceBinding.class); - if ("Service2".equals(service.getName())) { - wsBinding = wsb; - } else { - assert wsb == null; - } - } - assert "/ComponentB/Service2".equals(wsBinding.getURI()); - - // Should add to outer component service ComponentB/Service2 - // Should create WSDL document for ComponentB/Service2 with endpoint uri="/ComponentB/Service2" - // No other services on ComponentB should have - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - wsBinding = null; - for (ComponentService service : componentB.getServices()) { - WebServiceBinding wsb = service.getBinding(WebServiceBinding.class); - if ("Service2".equals(service.getName())) { - wsBinding = wsb; - } else { - assert wsb == null; - } - } - assert "/ComponentB/Service2".equals(wsBinding.getURI()); - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - port = svc.getPort("Service3Port"); - assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port)); - - if (!nonWiring) { - // Should create component service $promoted$ComponentB$slash$Service2 on innermost component - // ComponentD, with and uri="/ComponentB/Service2" - wsBinding = null; - for (ComponentService service : componentD.getServices()) { - if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert "/ComponentB/Service2".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - port = svc.getPort("Service3Port"); - assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port)); - } else { - // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD - for (ComponentService service : componentD.getServices()) { - assert !"$promoted$ComponentB$slash$Service2".equals(service.getName()); - } - } - - // Should add to outer composite service CompositeA/Service1 - wsBinding = null; - for (Service service : domainComposite.getServices()) { - if ("Service1".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert wsBinding != null; - if (nonWiring) { - // Should not add a WSDL document to domain composite service Service1 - assert wsBinding.getWSDLDocument() == null; - } - - if (!nonWiring) { - // Should create component service $promoted$Service1 on innermost component - // ComponentD, with and uri="/Service1" - wsBinding = null; - for (ComponentService service : componentD.getServices()) { - if ("$promoted$Service1".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert "/Service1".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - port = svc.getPort("Service3Port"); - assert "/Service1".equals(TestUtils.getPortAddress(port)); - } else { - // Should not create component service $promoted$.Service1 on innermost component ComponentD - for (ComponentService service : componentD.getServices()) { - assert !"$promoted$Service1".equals(service.getName()); - } - } - - // No services on ComponentD should have , except for Service3, - // $promoted$.Service1 and $promoted$.ComponentB.Service2 - for (ComponentService service : componentD.getServices()) { - if (!"Service3".equals(service.getName()) && - !"$promoted$Service1".equals(service.getName()) && - !"$promoted$ComponentB$slash$Service2".equals(service.getName())) { - assert service.getBinding(WebServiceBinding.class) == null; - } - } - } - - // Scenario 5: and on outer composite reference CompositeA/reference1 - public void testScenario5() throws Exception { - System.out.println("====>Running testScenario5"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario5.composite", "TestContribution", "src/main/resources/scenario5/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario5Results(false); - } - - public void testScenario5NonWiring() throws Exception { - System.out.println("====>Running testScenario5NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario5.composite", "TestContribution", "src/main/resources/scenario5/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario5Results(true); - } - - private void checkScenario5Results(boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - // Should not add to any outer component references - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - for (ComponentReference reference : componentB.getReferences()) { - assert reference.getBinding(WebServiceBinding.class) == null; - } - - Definition def; - javax.wsdl.Service svc; - Port port; - WebServiceBinding wsBinding; - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - if (!nonWiring) { - // Should add to inner component reference ComponentD/reference3 with uri="http://foo.com/bar" - // Should set on inner component reference ComponentD/reference3 - wsBinding = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getInterfaceContract(wsBinding) instanceof WSDLInterfaceContract; - } - } - assert "http://foo.com/bar".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://scenarios/ComponentD/reference3", "Service3aService")); - port = svc.getPort("Service3aPort"); - assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port)); - } else { - // Should not add to any inner component references - for (ComponentReference reference : componentD.getReferences()) { - assert reference.getBinding(WebServiceBinding.class) == null; - } - } - - // Should not add or to inner composite reference CompositeC/reference2 - Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario5", "CompositeC")); - for (Reference reference : compositeC.getReferences()) { - assert reference.getBinding(WebServiceBinding.class) == null; - assert reference.getInterfaceContract() instanceof JavaInterfaceContract; - } - } - - // Scenario 6: and on outer component reference ComponentB/reference2 - public void testScenario6() throws Exception { - System.out.println("====>Running testScenario6"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario6.composite", "TestContribution", "src/main/resources/scenario6/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario6and7Results("http://scenario6", false); - } - - public void testScenario6NonWiring() throws Exception { - System.out.println("====>Running testScenario6NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario6.composite", "TestContribution", "src/main/resources/scenario6/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario6and7Results("http://scenario6", true); - } - - private void checkScenario6and7Results(String namespace, boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - // Should remove target= on ComponentB/reference2 (for Scenario 6) or - // CompositeC/reference2 (for Scenario 7), and add uri="http://foo.com/bar" - // to the element on ComponentB/reference2 - // For nonWiring, ComponentB/reference2 should have target= - // and no uri= should be added - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - WebServiceBinding wsBinding = null; - for (ComponentReference reference : componentB.getReferences()) { - if ("reference2".equals(reference.getName())) { - if (!nonWiring) { - assert reference.getTargets().size() == 0; - } else { - assert reference.getTargets().size() == 1; - } - wsBinding = reference.getBinding(WebServiceBinding.class); - } - } - if (!nonWiring) { - assert "http://foo.com/bar".equals(wsBinding.getURI()); - } else { - assert wsBinding.getURI() == null; - } - - Definition def; - javax.wsdl.Service svc; - Port port; - if (!nonWiring) { - // Should create WSDL document for ComponentB/reference2 with endpoint uri="http://foo.com/bar" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://scenarios/ComponentB/reference2", "Service3aService")); - port = svc.getPort("Service3aPort"); - assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port)); - } - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - if (!nonWiring) { - // Should add to inner component reference ComponentD/reference3 with uri="http://foo.com/bar" - // Should set on inner component reference ComponentD/reference3 - wsBinding = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getBindings().size() == 1; - assert reference.getInterfaceContract(wsBinding) instanceof WSDLInterfaceContract; - } - } - assert "http://foo.com/bar".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://scenarios/ComponentB/reference2", "Service3aService")); - port = svc.getPort("Service3aPort"); - assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port)); - } else { - // Should not add to any inner component references - for (ComponentReference reference : componentD.getReferences()) { - assert reference.getBinding(WebServiceBinding.class) == null; - } - } - - // No references on CompositeC should have or , except for - // reference2 in Scenario 7 - Composite compositeC = TestUtils.getComposite(domainComposite, new QName(namespace, "CompositeC")); - for (Reference reference : compositeC.getReferences()) { - if ("http://scenario7".equals(namespace) && "reference2".equals(reference.getName())) { - assert reference.getBinding(WebServiceBinding.class)!= null; - assert reference.getInterfaceContract() instanceof WSDLInterfaceContract; - } else { - assert reference.getBinding(WebServiceBinding.class) == null; - assert reference.getInterfaceContract() instanceof JavaInterfaceContract; - } - } - - // Should add and to outer composite reference CompositeA/reference1 - wsBinding = null; - for (Reference reference : domainComposite.getReferences()) { - if ("reference1".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getInterfaceContract() instanceof WSDLInterfaceContract; - } - } - assert wsBinding.getURI() == null; - - // Should not add a WSDL document to domain composite reference reference1 - assert wsBinding.getWSDLDocument() == null; - } - - // Scenario 7: and on inner composite reference CompositeC/reference2 - public void testScenario7() throws Exception { - System.out.println("====>Running testScenario7"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario7.composite", "TestContribution", "src/main/resources/scenario7/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario6and7Results("http://scenario7", false); - } - - public void testScenario7NonWiring() throws Exception { - System.out.println("====>Running testScenario7NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario7.composite", "TestContribution", "src/main/resources/scenario7/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario6and7Results("http://scenario7", true); - } - - // Scenario 8: and on inner component reference ComponentD/reference3 - public void testScenario8() throws Exception { - System.out.println("====>Running testScenario8"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario8.composite", "TestContribution", "src/main/resources/scenario8/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario8Results(false); - } - - public void testScenario8NonWiring() throws Exception { - System.out.println("====>Running testScenario8NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario8.composite", "TestContribution", "src/main/resources/scenario8/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario8Results(true); - } - - private void checkScenario8Results(boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - // Should replace target= on ComponentD/reference3 by uri="http://foo.com/bar" on - // For nonWiring, the original target= is preserved and there is no uri= - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - WebServiceBinding wsBinding = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3".equals(reference.getName())) { - if (!nonWiring) { - assert reference.getTargets().size() == 0; - } else { - assert reference.getTargets().size() == 1; - } - wsBinding = reference.getBinding(WebServiceBinding.class); - } - } - if (!nonWiring) { - assert "http://foo.com/bar".equals(wsBinding.getURI()); - } else { - assert wsBinding.getURI() == null; - } - - Definition def; - javax.wsdl.Service svc; - Port port; - if (!nonWiring) { - // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://scenarios/ComponentD/reference3", "Service3aService")); - port = svc.getPort("Service3aPort"); - assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port)); - } - - // Should add and to inner composite reference CompositeC/reference2 - Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario8", "CompositeC")); - wsBinding = null; - for (Reference reference : compositeC.getReferences()) { - if ("reference2".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getInterfaceContract() instanceof WSDLInterfaceContract; - } - } - assert wsBinding.getURI() == null; - - // Should add and to outer component reference ComponentB/reference2 - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - wsBinding = null; - for (ComponentReference reference : componentB.getReferences()) { - if ("reference2".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getInterfaceContract() instanceof WSDLInterfaceContract; - } - } - assert wsBinding.getURI() == null; - - // Should add and to outer composite reference CompositeA/reference1 - wsBinding = null; - for (Reference reference : domainComposite.getReferences()) { - if ("reference1".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getInterfaceContract() instanceof WSDLInterfaceContract; - } - } - assert wsBinding.getURI() == null; - - // Should not add a WSDL document to domain composite reference reference1 - assert wsBinding.getWSDLDocument() == null; - } - - // Scenario 9: target in reference CDR3A and binding.ws uri= at CAR1A - public void testScenario9() throws Exception { - System.out.println("====>Running testScenario9"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario9.composite", "TestContribution", "src/main/resources/scenario9/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario9Results(); - } - - private void checkScenario9Results() { - Composite domainComposite = customBuilder.getDomainComposite(); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - ComponentReference componentRef = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3a".equals(reference.getName())) { - componentRef = reference; - assertTrue(reference.getBindings().size() == 2); - assertTrue(reference.getBindings().get(0) instanceof SCABinding); - assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding); - } - } - assertTrue(componentRef != null); - } - - // Scenario 10: targets in references CBR2A and CDR3A and binding.ws at CBR2A - public void testScenario10() throws Exception { - System.out.println("====>Running testScenario10"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario10.composite", "TestContribution", "src/main/resources/scenario10/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario10And11Results(); - } - - // Scenario 11: targets in references CBR2A and CDR3A and binding.ws at CCR2A - public void testScenario11() throws Exception { - System.out.println("====>Running testScenario11"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario11.composite", "TestContribution", "src/main/resources/scenario11/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario10And11Results(); - } - - private void checkScenario10And11Results() { - Composite domainComposite = customBuilder.getDomainComposite(); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - ComponentReference componentRef = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3a".equals(reference.getName())) { - componentRef = reference; - assertTrue(reference.getBindings().size() == 2); - Binding binding1 = reference.getBindings().get(0); - assertTrue(binding1 instanceof SCABinding); - assertTrue(reference.getInterfaceContract(binding1) instanceof JavaInterfaceContract); - Binding binding2 = reference.getBindings().get(1); - assertTrue(binding2 instanceof WebServiceBinding); - assertTrue(reference.getInterfaceContract(binding2) instanceof WSDLInterfaceContract); - } - } - assertTrue(componentRef != null); - } - - // Scenario 12: targets in references CBR2A and CDR3A and binding.ws at CDR3A - public void testScenario12() throws Exception { - System.out.println("====>Running testScenario12"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario12.composite", "TestContribution", "src/main/resources/scenario12/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario12Results(); - } - - private void checkScenario12Results() { - Composite domainComposite = customBuilder.getDomainComposite(); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - ComponentReference componentRef = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3a".equals(reference.getName())) { - componentRef = reference; - assertTrue(reference.getBindings().size() == 2); - assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding); - assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding); - } - } - assertTrue(componentRef != null); - } - - // Scenario 13: target in reference CDR3A - public void testScenario13() throws Exception { - System.out.println("====>Running testScenario13"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario13.composite", "TestContribution", "src/main/resources/scenario13/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario13Results(); - } - - private void checkScenario13Results() { - Composite domainComposite = customBuilder.getDomainComposite(); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - ComponentReference componentRef = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3a".equals(reference.getName())) { - componentRef = reference; - assertTrue(reference.getBindings().size() == 1); - assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding); - } - } - assertTrue(componentRef != null); - } - -} diff --git a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java deleted file mode 100644 index cad09920e8..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * 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.builder; - -import java.util.logging.Logger; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.DefaultEndpointFactory; -import org.apache.tuscany.sca.assembly.EndpointFactory; -import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.definitions.SCADefinitions; -import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; - -/** - * Test version of org.apache.tuscany.sca.assembly.builder.impl.builder.CompositeBuilderImpl - * - * This class should be identical to CompositeBuilderImpl except for omitting the - * following builders: - * componentWireBuilder - * compositeReferenceWireBuilder - * compositePromotedServiceBuilder - * It omits the component wiring step and the special processing that's performed - * for composite service and reference promotion. - * - * @version $Rev$ $Date$ - */ -public class CompositeBuilderNonWiringImpl implements CompositeBuilder { - private static final Logger logger = Logger.getLogger(CompositeBuilderNonWiringImpl.class.getName()); - private CompositeBuilder compositeIncludeBuilder; - //private CompositeBuilder componentReferenceWireBuilder; - //private CompositeBuilder componentReferencePromotionWireBuilder; - //private CompositeBuilder compositeReferenceWireBuilder; - private CompositeBuilder compositeCloneBuilder; - private CompositeBuilder componentConfigurationBuilder; - private CompositeBuilder compositeServiceConfigurationBuilder; - private CompositeBuilder compositeReferenceConfigurationBuilder; - private CompositeBuilder compositeBindingURIBuilder; - private CompositeBuilder componentServicePromotionBuilder; - //private CompositeBuilder compositeServicePromotionBuilder; - private CompositeBuilder compositePromotionBuilder; - private CompositeBuilder compositePolicyBuilder; - private CompositeBuilder componentServiceBindingBuilder; - private CompositeBuilder componentReferenceBindingBuilder; - - /** - * Constructs a new composite builder. - * - * @param assemblyFactory - * @param scaBindingFactory - * @param intentAttachPointTypeFactory - * @param interfaceContractMapper - * @param monitor - */ - public CompositeBuilderNonWiringImpl(AssemblyFactory assemblyFactory, - SCABindingFactory scaBindingFactory, - IntentAttachPointTypeFactory intentAttachPointTypeFactory, - InterfaceContractMapper interfaceContractMapper, - Monitor monitor) { - this(assemblyFactory, null, scaBindingFactory, intentAttachPointTypeFactory, interfaceContractMapper, null, monitor); - } - - /** - * Constructs a new composite builder. - * - * @param assemblyFactory - * @param scaBindingFactory - * @param endpointFactory - * @param intentAttachPointTypeFactory - * @param interfaceContractMapper - * @param policyDefinitions - * @param monitor - */ - public CompositeBuilderNonWiringImpl(AssemblyFactory assemblyFactory, - EndpointFactory endpointFactory, - SCABindingFactory scaBindingFactory, - IntentAttachPointTypeFactory intentAttachPointTypeFactory, - InterfaceContractMapper interfaceContractMapper, - SCADefinitions policyDefinitions, - Monitor monitor) { - - if (endpointFactory == null){ - endpointFactory = new DefaultEndpointFactory(); - } - - compositeIncludeBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeIncludeBuilderImpl(monitor); - //componentReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceWireBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor); - //componentReferencePromotionWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferencePromotionWireBuilderImpl(assemblyFactory, endpointFactory, monitor); - //compositeReferenceWireBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceWireBuilderImpl(assemblyFactory, endpointFactory, monitor); - compositeCloneBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeCloneBuilderImpl(monitor); - componentConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor); - compositeServiceConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeServiceConfigurationBuilderImpl(assemblyFactory); - compositeReferenceConfigurationBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceConfigurationBuilderImpl(assemblyFactory); - compositeBindingURIBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeBindingURIBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, policyDefinitions, monitor); - //componentServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServicePromotionBuilderImpl(assemblyFactory); - //compositeServicePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositeServicePromotionBuilderImpl(assemblyFactory); - compositePromotionBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePromotionBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor); - compositePolicyBuilder = new org.apache.tuscany.sca.assembly.builder.impl.CompositePolicyBuilderImpl(assemblyFactory, endpointFactory, interfaceContractMapper, monitor); - componentServiceBindingBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentServiceBindingBuilderImpl(monitor); - componentReferenceBindingBuilder = new org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceBindingBuilderImpl(monitor); - } - - public void build(Composite composite) throws CompositeBuilderException { - - // Collect and fuse includes - compositeIncludeBuilder.build(composite); - - // Expand nested composites - compositeCloneBuilder.build(composite); - - // Configure all components - componentConfigurationBuilder.build(composite); - - // Connect composite services/references to promoted services/references - compositePromotionBuilder.build(composite); - - // Compute the policies across the model hierarchy - compositePolicyBuilder.build(composite); - - // Configure composite services - compositeServiceConfigurationBuilder.build(composite); - - // Configure composite references - compositeReferenceConfigurationBuilder.build(composite); - - // Configure binding URIs - compositeBindingURIBuilder.build(composite); - - // Create promoted component services -// componentServicePromotionBuilder.build(composite); - - // Create promoted composite services -// compositeServicePromotionBuilder.build(composite); - - // Build component service binding-related information - componentServiceBindingBuilder.build(composite); - - // Wire the components -// componentReferenceWireBuilder.build(composite); - - // Wire the promoted component references -// componentReferencePromotionWireBuilder.build(composite); - - // Wire the composite references -// compositeReferenceWireBuilder.build(composite); - - // Build component reference binding-related information - componentReferenceBindingBuilder.build(composite); - - // Fuse nested composites - //FIXME do this later - //cloneBuilder.fuseCompositeImplementations(composite); - } - -} diff --git a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java deleted file mode 100644 index d4996c7418..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * 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.builder; - -import java.io.File; -import java.net.URI; -import java.net.URL; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLOutputFactory; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl; -import org.apache.tuscany.sca.assembly.xml.Constants; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.ModuleActivator; -import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.definitions.SCADefinitions; -import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.MonitorFactory; -import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; -import org.apache.tuscany.sca.workspace.Workspace; -import org.apache.tuscany.sca.workspace.WorkspaceFactory; -import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; -import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; - -public class CustomCompositeBuilder { - private ExtensionPointRegistry extensionPoints; - private URLArtifactProcessor contributionProcessor; - private ModelResolverExtensionPoint modelResolvers; - private ModelFactoryExtensionPoint modelFactories; - private WorkspaceFactory workspaceFactory; - private AssemblyFactory assemblyFactory; - private XMLOutputFactory outputFactory; - private StAXArtifactProcessor xmlProcessor; - private ContributionDependencyBuilder contributionDependencyBuilder; - private CompositeBuilder domainCompositeBuilder; - private static Workspace workspace; - private List policyDefinitions; - private Monitor monitor; - private Composite domainComposite; - private boolean nonWiring; - - public CustomCompositeBuilder(boolean nonWiring) { - this.nonWiring = nonWiring; - } - - private void init() { - - // Create extension point registry - extensionPoints = new DefaultExtensionPointRegistry(); - - // Create a monitor - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); - monitor = monitorFactory.createMonitor(); - - // Initialize the Tuscany module activators - ModuleActivatorExtensionPoint moduleActivators = extensionPoints.getExtensionPoint(ModuleActivatorExtensionPoint.class); - for (ModuleActivator activator : moduleActivators.getModuleActivators()) { - activator.start(extensionPoints); - } - - // Get XML input/output factories - modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); - XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class); - outputFactory = modelFactories.getFactory(XMLOutputFactory.class); - - // Get contribution workspace and assembly model factories - workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); - assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); - - // Create XML artifact processors - StAXArtifactProcessorExtensionPoint xmlProcessorExtensions = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - xmlProcessor = new ExtensibleStAXArtifactProcessor(xmlProcessorExtensions, inputFactory, outputFactory, monitor); - - // Create contribution content processor - URLArtifactProcessorExtensionPoint docProcessorExtensions = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - contributionProcessor = docProcessorExtensions.getProcessor(Contribution.class); - - // Get the model resolvers - modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class); - - // Create a contribution dependency builder - contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor); - - // Create a composite builder - SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class); - IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class); - InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class); - if (nonWiring) { - domainCompositeBuilder = new CompositeBuilderNonWiringImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper, monitor); - } else { - domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, contractMapper, monitor); - } - } - - public void loadContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception { - init(); - - // Create workspace model - workspace = workspaceFactory.createWorkspace(); - workspace.setModelResolver(new ExtensibleModelResolver(workspace, extensionPoints)); - - // Read the test contribution - URI artifactURI = URI.create(sourceURI); - URL artifactURL = new File(sourceURL).toURI().toURL(); - URL contributionURL = new File(compositeURL).toURI().toURL(); - Contribution testContribution = contributionProcessor.read(contributionURL, artifactURI, artifactURL); - workspace.getContributions().add(testContribution); - - // Build the contribution dependencies - Map> contributionDependencies = new HashMap>(); - Set resolved = new HashSet(); - for (Contribution contribution: workspace.getContributions()) { - List dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace); - - // Resolve contributions - for (Contribution dependency: dependencies) { - if (!resolved.contains(dependency)) { - resolved.add(dependency); - contributionProcessor.resolve(dependency, workspace.getModelResolver()); - } - } - - contributionDependencies.put(contribution, dependencies); - } - - // Create a composite model for the domain - domainComposite = assemblyFactory.createComposite(); - domainComposite.setName(new QName(Constants.SCA10_NS, "domain")); - - // Add all deployables to it, normally the domain administrator would select - // the deployables to include - domainComposite.getIncludes().addAll(workspace.getDeployables()); - - // Build the domain composite and wire the components included in it - domainCompositeBuilder.build(domainComposite); - } - - /** - * Returns the delegating model processor. - * @return the delegating model processor - */ - public StAXArtifactProcessor getModelProcessor() { - return xmlProcessor; - } - - /** - * Returns the XML output factory. - * @return the XML output factory - */ - public XMLOutputFactory getOutputFactory() { - return outputFactory; - } - - /** - * Returns the domain composite. - * @return the domain composite model object - */ - public Composite getDomainComposite() { - return domainComposite; - } - - /** - * Returns the monitor. - * @return the monitor instance - */ - public Monitor getMonitor() { - return monitor; - } - -} diff --git a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java deleted file mode 100644 index 9bff4d394e..0000000000 --- a/tags/java/sca/1.5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * 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.builder; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.WSDLException; -import javax.wsdl.extensions.soap.SOAPAddress; -import javax.wsdl.extensions.soap12.SOAP12Address; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLWriter; -import javax.xml.namespace.QName; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.stream.XMLStreamWriter; -import junit.framework.TestCase; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.ComponentReference; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Contract; -import org.apache.tuscany.sca.assembly.Implementation; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.xml.serialize.OutputFormat; -import org.apache.xml.serialize.XMLSerializer; -import org.w3c.dom.Document; - -/** - * Static utility methods for use by test cases. - * - * @version $Rev$ $Date$ - */ -public class TestUtils { - - protected static void checkProblems(CustomCompositeBuilder customBuilder) throws Exception { - boolean problems = false; - for (Problem problem : customBuilder.getMonitor().getProblems()) { - if (problem.getCause() != null) { - problem.getCause().printStackTrace(); - } - problems = true; - } - assert !problems; - } - - protected static String getPortAddress(Port port) { - Object ext = port.getExtensibilityElements().get(0); - if (ext instanceof SOAPAddress) { - return ((SOAPAddress)ext).getLocationURI(); - } - if (ext instanceof SOAP12Address) { - return ((SOAP12Address)ext).getLocationURI(); - } - return null; - } - - protected static Component getComponent(Composite composite, String name) { - for (Component component : composite.getComponents()) { - if (name.equals(component.getName())) { - return component; - } - // process implementation composites recursively - Implementation impl = component.getImplementation(); - if (impl instanceof Composite) { - Component comp = getComponent((Composite)impl, name); - if (comp != null) { - return comp; - } - } - } - return null; - } - - protected static Composite getComposite(Composite composite, QName name) { - if (name.equals(composite.getName())) { - return composite; - } - for (Component component : composite.getComponents()) { - // process implementation composites recursively - Implementation impl = component.getImplementation(); - if (impl instanceof Composite) { - Composite comp = getComposite((Composite)impl, name); - if (comp != null) { - return comp; - } - } - } - return null; - } - - protected static void printResults(CustomCompositeBuilder customBuilder) throws Exception { - for (Problem problem : customBuilder.getMonitor().getProblems()) { - if (problem.getCause() != null) { - problem.getCause().printStackTrace(); - } - } - Composite domainComposite = customBuilder.getDomainComposite(); - printComposite(domainComposite, customBuilder); - } - - private static void printComposite(Composite composite, CustomCompositeBuilder customBuilder) throws Exception { - // process implementation composites recursively - for (Component component : composite.getComponents()) { - Implementation implementation = component.getImplementation(); - if (implementation instanceof Composite) { - printComposite((Composite)implementation, customBuilder); - } - } - - // write out the SCDL - writeSCDL(composite, customBuilder); - - // find all the component service and reference bindings - for (Component component : composite.getComponents()) { - for (ComponentService componentService : component.getServices()) { - for (Binding binding : componentService.getBindings()) { - if (binding instanceof WebServiceBinding) { - writeWSDL(component, componentService, ((WebServiceBinding)binding).getWSDLDocument()); - } - } - } - for (ComponentReference componentReference : component.getReferences()) { - for (Binding binding : componentReference.getBindings()) { - if (binding instanceof WebServiceBinding) { - writeWSDL(component, componentReference, ((WebServiceBinding)binding).getWSDLDocument()); - } - } - } - } - - // find all the composite service and reference bindings - for (Service service : composite.getServices()) { - for (Binding binding : service.getBindings()) { - if (binding instanceof WebServiceBinding) { - writeWSDL(null, service, ((WebServiceBinding)binding).getWSDLDocument()); - } - } - } - for (Reference reference : composite.getReferences()) { - for (Binding binding : reference.getBindings()) { - if (binding instanceof WebServiceBinding) { - writeWSDL(null, reference, ((WebServiceBinding)binding).getWSDLDocument()); - } - } - } - } - - private static void writeSCDL(Composite composite, CustomCompositeBuilder customBuilder) throws Exception { - // Print out a composite - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - XMLStreamWriter writer = customBuilder.getOutputFactory().createXMLStreamWriter(bos); - customBuilder.getModelProcessor().write(composite, writer); - - // Parse and write again to pretty format it - DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray())); - OutputFormat format = new OutputFormat(); - format.setIndenting(true); - format.setIndent(2); - XMLSerializer serializer = new XMLSerializer(System.out, format); - System.out.println("-->Runtime SCDL model for composite " + composite.getName()); - serializer.serialize(document); - } - - private static void writeWSDL(Component component, Contract contract, Definition definition) { - if (definition == null) { - System.out.println("-->No generated WSDL for " + (component != null ? component.getName() : "") + "/" + contract.getName()); - } else { - try { - System.out.println("-->Generated WSDL for " + (component != null ? component.getName() : "") + "/" + contract.getName()); - WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter(); - writer.writeWSDL(definition, System.out); - } catch (WSDLException e) { - // ignore - } - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/pom.xml b/tags/java/sca/1.5.1/itest/callablereferences-ws/pom.xml deleted file mode 100644 index cff55122fc..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callablereferences-ws - Apache Tuscany SCA iTest Callable References over Web Services - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java deleted file mode 100644 index ecf1ac27e1..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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 com.example; - -public interface ExampleClient { - - void runTest(); - - void sayHello(String name); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java deleted file mode 100644 index c46087d865..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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 com.example; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(ExampleClient.class) -@Scope("COMPOSITE") -public class ExampleClientImpl implements ExampleClient { - - private ExampleService myService; - - @Context - protected ComponentContext context; - - @Reference - public void setMyService(ExampleService myService) { - this.myService = myService; - } - - public void runTest() { - ServiceReference ref = context.createSelfReference(ExampleClient.class); - ref.getService().sayHello("Jack"); - CallableReference result = myService.hello("Jill", ref); - if (result != null) { - ((CallableReference)result).getService().sayHello("John"); - } - result = myService.hello("Jane", null); - if (result != null) { - ((CallableReference)result).getService().sayHello("Jim"); - } - } - - public void sayHello(String name) { - System.out.println("Hello, client " + name + "!"); - } -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java deleted file mode 100644 index 670c145cc3..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 com.example; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface ExampleService { - - CallableReference hello(String name, ServiceReference ref); - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java deleted file mode 100644 index eb4d647a22..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 com.example; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.ServiceReference; - -public class ExampleServiceImpl implements ExampleService { - - public CallableReference hello(String name, ServiceReference ref) { - if (ref != null) { - ((ServiceReference)ref).getService().sayHello(name); - } - return (CallableReference)ref; - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java deleted file mode 100644 index bb5e57397d..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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.callablerefwsreturn; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface Alpha { - boolean run(); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java deleted file mode 100644 index 6e5f1cedf9..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * 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.callablerefwsreturn; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.Conversation; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(Alpha.class) -@Scope("COMPOSITE") -public class AlphaImpl implements Alpha { - @Reference - public Beta beta; - - @Context - protected ComponentContext componentContext; - - Object conversationId0 = null; - - public boolean run() { - CallableReference gammaRef = null; - try { - Object conversationId1 = null; - Object conversationId2 = null; - - // it is expected that this call returns a reference to Gamma that - // reuses the established Conversation - gammaRef = beta.getRef(); - - // no Conversation exists - Conversation con = gammaRef.getConversation(); - if (con == null) { - System.out.println("Alpha1: Conversation to gamma is null"); - } else { - System.out - .println("Alpha1: Conversation to gamma exists. conversationId=" - + con.getConversationID()); - conversationId1 = con.getConversationID(); - } - - // this call should reuse a Conversation, but as none exists it - // creates a new conversation - gammaRef.getService().doSomething(); - gammaRef.getService().doSomething(); - gammaRef.getService().doSomething(); - - con = gammaRef.getConversation(); - if (con == null) { - System.out.println("Alpha2: Conversation to gamma is null"); - } else { - System.out - .println("Alpha2: Conversation to gamma exists. conversationId=" - + con.getConversationID()); - conversationId2 = con.getConversationID(); - } - - boolean testPassed = conversationId1.equals(conversationId2); - - if (conversationId0 == null){ - conversationId0 = conversationId1; - return testPassed; - } else { - return testPassed && (!conversationId0.equals(conversationId1)); - } - - } catch (Exception e) { - e.printStackTrace(); - return false; - } finally { - if (gammaRef != null) { - gammaRef.getService().stop(); - } - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java deleted file mode 100644 index 995e4fcf39..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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.callablerefwsreturn; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface Beta { - CallableReference getRef(); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java deleted file mode 100644 index be72fd779e..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.callablerefwsreturn; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(Beta.class) -@Scope("COMPOSITE") -public class BetaImpl implements Beta { - @Context - protected ComponentContext componentContext; - - @Reference - public Gamma gamma; - - public CallableReference getRef() { - ServiceReference gammaRef = componentContext - .getServiceReference(Gamma.class, "gamma"); - Gamma g = gammaRef.getService(); - g.start(); - return gammaRef; - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java deleted file mode 100644 index b73f26b573..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.callablerefwsreturn; - -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Conversational -public interface Gamma { - int start(); - - void doSomething(); - - @EndsConversation - void stop(); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java deleted file mode 100644 index c3abc4c65d..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.callablerefwsreturn; - -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(Gamma.class) -@Scope("CONVERSATION") -public class GammaImpl implements Gamma { - @ConversationID - protected String conversationId; - - public GammaImpl() { - System.out.println("GammaImpl:GammaImpl(), conversationId=" - + conversationId); - } - - public int start() { - System.out.println("Gamma:start(), conversationId=" + conversationId); - return 1; - } - - public void doSomething() { - System.out.println("Gamma:doSomething(), conversationId=" - + conversationId); - } - - public void stop() { - System.out.println("Gamma:stop(), conversationId=" + conversationId); - } -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite deleted file mode 100644 index 3d782a0b84..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/example.composite b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/example.composite deleted file mode 100644 index ea0819a32e..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/main/resources/example.composite +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java deleted file mode 100644 index 310e31fb02..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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 com.example; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class ExampleTestCase extends TestCase { - - private SCADomain scaDomain; - private ExampleClient client; - - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("example.composite"); - client = scaDomain.getService(ExampleClient.class, "ExampleClientComponent"); - } - - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void test() throws Exception { - client.runTest(); - } -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java deleted file mode 100644 index 66fb2ef96c..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.callablerefws; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.itest.callablerefwsreturn.Alpha; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -public class CallableReferenceReturnTestCase { - private static SCADomain domain; - private static Alpha alpha; - - @BeforeClass - public static void init() throws Exception { - domain = SCADomain.newInstance("CallableReferenceWsReturnTest.composite"); - alpha = domain.getService(Alpha.class, "Alpha"); - } - - @AfterClass - public static void destroy() throws Exception { - domain.close(); - } - - @Test - public void testCallableReferenceReturn() { - Assert.assertTrue(alpha.run()); - Assert.assertTrue(alpha.run()); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/pom.xml b/tags/java/sca/1.5.1/itest/callablereferences/pom.xml deleted file mode 100644 index a2fc1ec826..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callablereferences - Apache Tuscany SCA iTest Callable References - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-node-impl - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - test - - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - test - - - - org.apache.tuscany.sca - tuscany-binding-sca-axis2 - 1.5.1 - test - - - diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java deleted file mode 100644 index 5934f16851..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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.callableref; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface AComponent { - String foo(); - - String fooB(); - String fooB1(); - - String fooC(); - String fooC1(); - - String fooStringD(); - String fooD(); - - String fooBC(); - - String invokeDReference(); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java deleted file mode 100644 index 7c2fd092dc..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * 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.callableref; - -import java.io.ByteArrayOutputStream; -import java.io.ObjectOutputStream; - -import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(AComponent.class) -public class AComponentImpl implements AComponent { - - @Context - protected ComponentContext componentContext; - - @Reference(name = "bReference") - protected BComponent b; - - @Reference - protected CComponent cReference; - - @Reference - protected ServiceReference cServiceReference; - - @Reference(required=false) - protected DComponent dReference; - - protected DComponent dReference1; - - @Reference(name = "dReference1") - public void setDReference(DComponent dReference) { - this.dReference1 = dReference; - } - - public String foo() { - return "AComponent"; - } - - public String fooB() { - return b.foo(); - } - - public String fooB1() { - CallableReference bRef = componentContext.cast(b); - return bRef.getService().foo(); - } - - public String fooC() { - return cReference.foo(); - } - - public String fooC1() { - return cServiceReference.getService().foo(); - } - - public String fooBC() { - CallableReference cReference = componentContext.getServiceReference(CComponent.class, "cReference"); - return b.fooC(cReference); - } - - public String fooD() { - CallableReference aReference = componentContext.createSelfReference(AComponent.class); - return dReference1.foo(aReference); - } - - /** - * A test case to work out what needs to be done in a transformer to get the - * CallableReference across the wire. Left here for interest in case anyone - * is looking for how to get at the innards of CallableReferences - */ - public String fooStringD() { - CallableReference aReference = componentContext.createSelfReference(AComponent.class); - ByteArrayOutputStream bos = null; - - try { - bos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(bos); - oos.writeObject(aReference); - } catch (Exception ex) { - System.out.println(ex.toString()); - return null; - } - - String aReferenceString = Base64Binary.encode(bos.toByteArray()); - return dReference1.fooString(aReferenceString); - } - - public String invokeDReference() { - return dReference.foo(null); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java deleted file mode 100644 index ade672b0ab..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.callableref; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface BComponent { - - String foo(); - - String fooC(CallableReference cComponent); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java deleted file mode 100644 index 518e77d3a8..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.callableref; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Service; - -@Service(BComponent.class) -public class BComponentImpl implements BComponent { - - public BComponentImpl() { - } - - public String foo() { - return "BComponent"; - } - - public String fooC(CallableReference cReference) { - return "B" + cReference.getService().foo(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java deleted file mode 100644 index fdf80cc1c8..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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.callableref; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CComponent { - - String foo(); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java deleted file mode 100644 index cc8ec8f000..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.callableref; - -import org.osoa.sca.annotations.Service; - -@Service(CComponent.class) -public class CComponentImpl implements CComponent { - - public String foo() { - return "CComponent"; - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java deleted file mode 100644 index 48b697df31..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.callableref; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface DComponent { - - String foo(CallableReference aReference); - - String fooString(String aReferenceString); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java deleted file mode 100644 index 27ad48b9fe..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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.callableref; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary; -import org.osoa.sca.CallableReference; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; - -@Service(DComponent.class) -public class DComponentImpl implements DComponent { - - @Context - protected RequestContext requestContext; - - public String foo(CallableReference aReference) { - try { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(bos); - oos.writeObject(aReference); - ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray())); - Object obj = ois.readObject(); - aReference = (CallableReference) obj; - } catch (Exception e) { - e.printStackTrace(); - } - System.out.println("Invoking service: " + requestContext.getServiceName()); - return "D" + aReference.getService().foo(); - } - - public String fooString(String aReferenceString) { - CallableReference aReference = null; - try { - ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(Base64Binary.decode(aReferenceString))); - Object obj = ois.readObject(); - aReference = (CallableReference) obj; - } catch (Exception e) { - e.printStackTrace(); - } - System.out.println("Invoking service: " + requestContext.getServiceName()); - return "D" + aReference.getService().foo(); - } -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java deleted file mode 100644 index abcedfa6e1..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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.callablerefconversational; - -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Conversational; - -/** - * Simple conversational Service that is used to testing the method - * ComponentContext.createSelfReference() - * - * @version $Date$ $Revision$ - */ -@Conversational -public interface ConversationalService { - /** - * Default value for the user data - */ - String DEFAULT_USER_DATA = "NOT SET"; - - /** - * Retrieves the conversation ID for this Service - * - * @return The conversation ID for this Service - */ - Object getConversationID(); - - /** - * Creates a self reference to this Service - * - * @return A self reference to this Service - */ - ServiceReference createSelfRef(); - - /** - * Sets some user data on the instance - * - * @param a_Data Some data - * - * @See {@link #getUserData()} - */ - void setUserData(String a_Data); - - /** - * Gets some user data on the instance - * - * @return Some data - * - * @See {@link #setUserData(String)} - */ - String getUserData(); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java deleted file mode 100644 index f2e0ce7582..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * 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.callablerefconversational; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Simple conversational Service that is used to testing the method - * ComponentContext.createSelfReference() - * - * @version $Date$ $Revision$ - */ -@Service(ConversationalService.class) -@Scope("CONVERSATION") -public class ConversationalServiceImpl implements ConversationalService { - - /** - * The Conversation ID - */ - private Object m_ConversationID; - - /** - * Reference to the ComponentContext. - */ - @Context - protected ComponentContext m_Ctx; - - /** - * Some user data - */ - private String m_UserData = DEFAULT_USER_DATA; - - /** - * Constructor - */ - public ConversationalServiceImpl() { - System.out.println("New instance of " + this + " created"); - } - - /** - * Used to inject the Conversation ID - * - * @param a_ConversationID the Conversation ID - */ - @ConversationID - public void setConversationID(Object a_ConversationID) { - m_ConversationID = a_ConversationID; - System.out.println("Converstation ID set on " + this + " to " + a_ConversationID); - } - - /** - * Retrieves the conversation ID for this Service - * - * @return The conversation ID for this Service - */ - public Object getConversationID() { - return m_ConversationID; - } - - /** - * Creates a self reference to this Service - * - * @return A self reference to this Service - */ - public ServiceReference createSelfRef() { - return m_Ctx.createSelfReference(ConversationalService.class); - } - - /** - * Sets some user data on the instance - * - * @param a_Data Some data - * - * @See {@link #getUserData()} - */ - public void setUserData(String a_Data) { - m_UserData = a_Data; - } - - /** - * Gets some user data on the instance - * - * @return Some data - * - * @See {@link #setUserData(String)} - */ - public String getUserData() { - return m_UserData; - } -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java deleted file mode 100644 index ab21421c4d..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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.callablerefreturn; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface Alpha -{ - boolean run(); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java deleted file mode 100644 index 5b5984b164..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * 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.callablerefreturn; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.Conversation; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; - -@Scope("COMPOSITE") -public class AlphaImpl implements Alpha { - @Reference - public Beta beta; - - @Context - protected ComponentContext componentContext; - - public boolean run() { - CallableReference gammaRef = null; - try { - Object conversationId1 = null; - Object conversationId2 = null; - - // it is expected that this call returns a reference to Gamma that - // reuses the established Conversation - gammaRef = beta.getRef(); - - // no Conversation exists - Conversation con = gammaRef.getConversation(); - if (con == null) { - System.out.println("Alpha: Conversation to gamma is null"); - } else { - System.out - .println("Alpha: Conversation to gamma exists. conversationId=" - + con.getConversationID()); - conversationId1 = con.getConversationID(); - } - - // this call should reuse a Conversation, but as none exists it - // creates a new conversation - gammaRef.getService().doSomething(); - con = gammaRef.getConversation(); - if (con == null) { - System.out.println("Alpha: Conversation to gamma is null"); - } else { - System.out - .println("Alpha: Conversation to gamma exists. conversationId=" - + con.getConversationID()); - conversationId2 = con.getConversationID(); - } - - if ((conversationId1 == null) || (conversationId2 == null)) { - return false; - } - - boolean testPassed = conversationId1.equals(conversationId2); - return testPassed; - } catch (Exception e) { - e.printStackTrace(); - return false; - } finally { - if (gammaRef != null) { - gammaRef.getService().stop(); - } - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java deleted file mode 100644 index 223c467f47..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.callablerefreturn; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface Beta -{ - CallableReference getRef(); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java deleted file mode 100644 index ed4e66bec3..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.callablerefreturn; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; - -@Scope("COMPOSITE") -public class BetaImpl implements Beta -{ - @Context - protected ComponentContext componentContext; - - @Reference - public Gamma gamma; - - public CallableReference getRef() - { - ServiceReference gammaRef = componentContext.getServiceReference(Gamma.class, "gamma"); - gammaRef.getService().start(); - return gammaRef; - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java deleted file mode 100644 index e32051373f..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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.callablerefreturn; - -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Conversational -public interface Gamma -{ - void start(); - - void doSomething(); - - @EndsConversation - void stop(); -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java deleted file mode 100644 index adf5a1c1ce..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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.callablerefreturn; - -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; - -@Scope("CONVERSATION") -public class GammaImpl implements Gamma -{ - @ConversationID - protected String conversationId; - - - public void start() - { - System.out.println("Gamma:start(), conversationId=" + conversationId); - } - - - public void doSomething() - { - System.out.println("Gamma:doSomething(), conversationId=" + conversationId); - } - - - public void stop() - { - System.out.println("Gamma:stop(), conversationId=" + conversationId); - } -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite deleted file mode 100644 index 0bf8f7ef1e..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite deleted file mode 100644 index 5b3add1e61..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite deleted file mode 100644 index 49b75f56e4..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite deleted file mode 100644 index 9216f44191..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml deleted file mode 100644 index 95021f72a4..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite deleted file mode 100644 index 42d739564c..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml deleted file mode 100644 index 2edda61601..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java deleted file mode 100644 index a9cbb5d0a1..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * 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.callableref; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.itest.callablerefconversational.ConversationalService; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osoa.sca.ServiceReference; - -/** - * Simple test case that creates a ServiceReference to a Conversational Component - * using ComponentContext.createSelfReference() - *

- * This test case is for TUSCANY-2208 - * - * @version $Date$ $Revision$ - */ -public class CallableReferenceConversationalTestCase { - private static SCADomain domain; - private static ConversationalService acomponent; - - @BeforeClass - public static void init() throws Exception { - domain = SCADomain.newInstance("CallableReferenceConversationalTest.composite"); - Assert.assertNotNull(domain); - acomponent = domain.getService(ConversationalService.class, "ConversationalComponent"); - } - - @AfterClass - public static void destroy() throws Exception { - if (domain != null) { - domain.close(); - } - } - - /** - * This is a dummy test so that this Unit Test has a test so it will build. - * Once TUSCANY-2208 is fixed, this dummy test method can be removed - */ - @Test - public void dummyTestRemoveWhenTuscany2208IsFixed() { - } - - /** - * Tests creating Self References and validate them with Conversation IDs - */ - // Disabled until TUSCANY-2208 is fixed - // @Test - public void testCreateSelfRefUsingConvID() { - Assert.assertNotNull(acomponent); - - final Object origConvID = acomponent.getConversationID(); - Assert.assertNotNull(origConvID); - final ServiceReference ref = acomponent.createSelfRef(); - Assert.assertNotNull(ref); - - final ConversationalService resolvedRef = ref.getService(); - Assert.assertNotNull(resolvedRef); - final Object newConvID = resolvedRef.getConversationID(); - Assert.assertNotNull(newConvID); - - Assert.assertEquals(origConvID, newConvID); - } - - /** - * Tests creating Self References and validate them with user specified data - */ - // Disabled until TUSCANY-2208 is fixed - // @Test - public void testCreateSelfRefUsingUserData() { - Assert.assertNotNull(acomponent); - - final String origUserData = acomponent.getUserData(); - Assert.assertEquals(ConversationalService.DEFAULT_USER_DATA, origUserData); - - final String userData = "Some new user data set at " + System.currentTimeMillis(); - acomponent.setUserData(userData); - - final ServiceReference ref = acomponent.createSelfRef(); - Assert.assertNotNull(ref); - - final ConversationalService resolvedRef = ref.getService(); - Assert.assertNotNull(resolvedRef); - final String newUserData = resolvedRef.getUserData(); - Assert.assertNotNull(newUserData); - - Assert.assertEquals(userData, newUserData); - } -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java deleted file mode 100644 index ba9020811c..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * 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.callableref; - - -import static junit.framework.Assert.assertEquals; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - - -/** - * Runs a distributed domain in a single VM by using and in memory - * implementation of the distributed domain - */ -public class CallableReferenceRemoteTestCase { - - private static SCANode nodeA; - private static SCANode nodeB; - - private static AComponent acomponent; - - @BeforeClass - public static void init() throws Exception { - - try { - - System.out.println("Setting up nodes"); - - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/nodeA").toURL().toString())); - - - nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/nodeB").toURL().toString())); - - - nodeA.start(); - nodeB.start(); - - acomponent = ((SCAClient)nodeA).getService(AComponent.class, "AComponent/AComponent"); - - } catch (Throwable ex) { - System.out.println(ex.toString()); - // Print detailed cause information. - ex.printStackTrace(); - StringBuffer sb = new StringBuffer(); - Throwable cause = ex.getCause(); - while ( cause != null ) { - sb.append( " " ); - System.out.println( sb.toString() + "Cause: " + cause ); - if (cause instanceof java.lang.reflect.InvocationTargetException) - System.out.println( sb.toString() + "Target Exception: " + ((java.lang.reflect.InvocationTargetException)cause).getTargetException() ); - cause = cause.getCause(); - } - } - } - - @AfterClass - public static void destroy() throws Exception { - // stop the nodes and hence the domains they contain - nodeA.stop(); - nodeB.stop(); - } - - //@Test - public void testKeepServerRunning1() throws Exception { - System.out.println("press enter to continue"); - System.in.read(); - } - - @Test - public void testBReference() { - assertEquals("BComponent", acomponent.fooB()); - } - - @Test - public void testBCast() { - assertEquals("BComponent", acomponent.fooB1()); - } - - @Test - public void testCReference() { - assertEquals("CComponent", acomponent.fooC()); - } - - @Test - public void testCServiceReference() { - assertEquals("CComponent", acomponent.fooC1()); - } - - @Test - public void testDReferenceString() { - assertEquals("DAComponent", acomponent.fooStringD()); - } - - @Test - public void testDReference() { - assertEquals("DAComponent", acomponent.fooD()); - } - - - @Test - public void testBCReference() { - assertEquals("BCComponent", acomponent.fooBC()); - } - - @Test - public void testRequiredFalseReference() { - try { - acomponent.invokeDReference(); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java deleted file mode 100644 index f2d8fe5d64..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.callableref; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.itest.callablerefreturn.Alpha; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -public class CallableReferenceReturnTestCase { - private static SCADomain domain; - private static Alpha alpha; - - @BeforeClass - public static void init() throws Exception { - domain = SCADomain.newInstance("CallableReferenceReturnTest.composite"); - alpha = domain.getService(Alpha.class, "Alpha"); - } - - @AfterClass - public static void destroy() throws Exception { - domain.close(); - } - - @Test - public void testCallableReferenceReturn() { - Assert.assertTrue(alpha.run()); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java deleted file mode 100644 index d785a6a397..0000000000 --- a/tags/java/sca/1.5.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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.callableref; - -import static junit.framework.Assert.assertEquals; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class CallableReferenceTestCase { - private static SCADomain domain; - private static AComponent acomponent; - - @BeforeClass - public static void init() throws Exception { - domain = SCADomain.newInstance("CallableReferenceTest.composite"); - acomponent = domain.getService(AComponent.class, "AComponent"); - } - - @AfterClass - public static void destroy() throws Exception { - domain.close(); - } - - @Test - public void testBReference() { - assertEquals("BComponent", acomponent.fooB()); - } - - @Test - public void testBCast() { - assertEquals("BComponent", acomponent.fooB1()); - } - - @Test - public void testCReference() { - assertEquals("CComponent", acomponent.fooC()); - } - - @Test - public void testCServiceReference() { - assertEquals("CComponent", acomponent.fooC1()); - } - - @Test - public void testDReference() { - assertEquals("DAComponent", acomponent.fooD()); - } - - @Test - public void testBCReference() { - assertEquals("BCComponent", acomponent.fooBC()); - } - - @Test - public void testRequiredFalseReference() { - try { - acomponent.invokeDReference(); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-api/pom.xml b/tags/java/sca/1.5.1/itest/callback-api/pom.xml deleted file mode 100644 index d351f7a813..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-api/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callback-api - Apache Tuscany SCA iTest Callback API - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - - ${basedir}/../build-was-integration.xml - ${basedir}/../wasAdmin.py - - diff --git a/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java deleted file mode 100644 index de17ba2f0d..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/** - * - */ -public interface CallBackApiCallBack { - /** - * This function is defined in CallBackApiClientImpl - */ - public void callBackMessage(String aString); - - /** - * This function is defined in CallBackApiClientImpl - */ - public void callBackIncrement(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java deleted file mode 100644 index 5fd4a71466..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackApiClient { - /** - * This function is defined in CallBackApiClientImpl - */ - public void run(); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java deleted file mode 100644 index 274984abb3..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java +++ /dev/null @@ -1,206 +0,0 @@ -/* - * 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.test; - -import junit.framework.Assert; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(CallBackApiClient.class) -public class CallBackApiClientImpl implements CallBackApiClient, CallBackApiCallBack { - - @Reference - protected CallBackApiService aCallBackService; - - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - /** - * This test calls function test 3a,3a1,3b,3c - */ - public void run() { - - // This tests basic callback patterns. - - // Test3a is the basic callback where the target calls back prior to - // returning to the client. - test3a(); - - test3a1(); - - // Test3b is where the target does not call back to the client. - test3b(); - - // Test3c is where the target calls back multiple times to the client. - test3c(); - - return; - } - - /** - * This test is the basic callback where the target calls back prior to returning to the client. - */ - - private void test3a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage()); - - } - - /** - * This test is the basic callback where the target calls back prior to returning to the client. - */ - private void test3a1() { - aCallBackService.knockKnockByRef("Knock Knock"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage()); - - } - - /** - * This test is the basic callback where the target does not call back to the client - */ - private void test3b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackApiITest - test3b", 1, 1); - return; - } - - /** - * This test is the basic callback where the target calls back multiple times to the client - */ - - private void test3c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackApiITest - test3c", 3, this.getCallBackCount()); - return; - } - - /** - * This function returns a string - * - * @param void - * @return String result string - */ - - public String getReturnMessage() { - return returnMessage; - } - - /** - * This function set the returnMessage string - * - * @param String - */ - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - /** - * This function returns the callBackCount variable - * - * @return Integer callBackCount variable - */ - public int getCallBackCount() { - return callBackCount; - } - - /** - * This function increments callBackCount variable by 1 - */ - public void incrementCallBackCount() { - callBackCount++; - } - - /** - * This function prints a message synched with setReturnMessage function - * - * @param String - */ - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - /** - * This function prints a message synched with incrementCallBackCount function - * - * @param String - */ - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java deleted file mode 100644 index 33de1e7739..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Callback(CallBackApiCallBack.class) -/** - * - */ -public interface CallBackApiService { - /** - * This function is defined in CallBackApiServiceImpl - */ - public void knockKnock(String aString); - - /** - * This function is defined in CallBackApiServiceImpl - */ - public void knockKnockByRef(String aString); - - /** - * This function is defined in CallBackApiServiceImpl - */ - public void noCallBack(String aString); - - /** - * This function is defined in CallBackApiServiceImpl - */ - public void multiCallBack(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java deleted file mode 100644 index 61e2c7ee8f..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; - -@Service(CallBackApiService.class) -public class CallBackApiServiceImpl implements CallBackApiService { - - @Context - protected ComponentContext componentContext; - /** - * Object of CallBackApiCallBack class - */ - private CallBackApiCallBack callback; - - @Callback - protected CallableReference callbackRef; - - /** - * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function and calls the - * callBackMessage function. - * - * @param aString String passed by a function call - */ - - public void knockKnock(String aString) { - - System.out.println("CallBackApiServiceImpl message received: " + aString); - callback = this.getCallBackInterface(); - callback.callBackMessage("Who's There"); - System.out.println("CallBackApiServiceImpl response sent"); - return; - - } - - /** - * This function calls the callBackMessage function.
- * The reference to this function is received from Call back reference to the class CallBackApiService. - * - * @param aString String passed by a function call - */ - public void knockKnockByRef(String aString) { - - System.out.println("CallBackApiServiceImpl message received: " + aString); - callbackRef.getService().callBackMessage("Who's There"); - System.out.println("CallBackApiServiceImpl response sent"); - return; - - } - - /** - * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function.
- * This function then places multiple callBack using the callbackIncrement function defined in - * callBack.ApiServiceImpl - * - * @param aString String passed by a function call - */ - public void multiCallBack(String aString) { - - callback = this.getCallBackInterface(); - - System.out.println("CallBackApiServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackApiServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackApiServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackApiServiceImpl response sent"); - return; - - } - - /** - * This function does not callBack any function. - * - * @param aString String passed by a function call - */ - public void noCallBack(String aString) { - - System.out.println("CallBackApiServiceImpl message received: " + aString); - - return; - - } - - /** - * This function get an object of CallBackApiServiceImpl from the present componentContext - * - * @param void - */ - private CallBackApiCallBack getCallBackInterface() { - System.out.println("CallBackApiServiceImpl getting request context"); - RequestContext rc = componentContext.getRequestContext(); - System.out.println("CallBackApiServiceImpl getting callback from request context"); - callback = rc.getCallback(); - System.out.println("CallBackApiServiceImpl returning callback"); - return callback; - - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-api/src/main/resources/CallBackApiTest.composite b/tags/java/sca/1.5.1/itest/callback-api/src/main/resources/CallBackApiTest.composite deleted file mode 100644 index 946c4862ee..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-api/src/main/resources/CallBackApiTest.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 19eb25631e..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/tags/java/sca/1.5.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java deleted file mode 100644 index 9471049c74..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackApiTestCase extends TestCase { - - private static SCADomain domain; - private CallBackApiClient aCallBackClient; - - /** - * This function uses the Instance of CallBackApiClient.class
- * This function calls the run function defined in the CallBackApiClinet Interface
- * which in turn executes the following test cases.
- * 1. Basic callback patterns
- * 2. Test in which the target does not call back to the client
- * 3. Test in which the target calls back multiple times to the client. - */ - public void testCallBackBasic() { - aCallBackClient.run(); - } - - /** - * This function creates the SCADomain instance and gets an Instance of CallBackApiClient.class - */ - @Override - protected void setUp() throws Exception { - if (domain == null) { - domain = SCADomain.newInstance("CallBackApiTest.composite"); - } - - aCallBackClient = domain.getService(CallBackApiClient.class, "CallBackApiClient"); - } - - /** - * This function destroys the SCADomain instance that was created in setUp() - */ - @Override - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-basic/pom.xml b/tags/java/sca/1.5.1/itest/callback-basic/pom.xml deleted file mode 100644 index 13a2c16e5c..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-basic/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callback-basic - Apache Tuscany SCA iTest Callback Basic - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - - ${basedir}/../build-was-integration.xml - ${basedir}/../wasAdmin.py - - diff --git a/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java deleted file mode 100644 index 5e9d3d6821..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/** - * - */ -public interface CallBackBasicCallBack { - - public void callBackMessage(String aString); - - public void callBackIncrement(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java deleted file mode 100644 index 9f4019f28c..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackBasicClient { - - public void run(); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java deleted file mode 100644 index e0e6d7eb8c..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * 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.test; - -import junit.framework.Assert; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(CallBackBasicClient.class) -public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack { - - @Reference - protected CallBackBasicService aCallBackService; - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - public void run() { - - // This tests basic callback patterns. - - // Test1 is the basic callback where the target calls back prior to - // returning to the client. - test1a(); - - // Test2 is where the target does not call back to the client. - test1b(); - - // Test3 is where the target calls back multiple times to the client. - test1c(); - - return; - } - - private void test1a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test1a", "Who's There", this.getReturnMessage()); - - } - - private void test1b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackBasicITest - test1b", 1, 1); - - return; - } - - private void test1c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount()); - return; - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java deleted file mode 100644 index bd41fa7037..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Callback(CallBackBasicCallBack.class) -/** - * - */ -public interface CallBackBasicService { - - public void knockKnock(String aString); - - public void noCallBack(String aString); - - public void multiCallBack(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java deleted file mode 100644 index 4ca2dc9af9..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; - -@Service(CallBackBasicService.class) -public class CallBackBasicServiceImpl implements CallBackBasicService { - - @Callback - protected CallBackBasicCallBack callback; - - public void knockKnock(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackBasicServiceImpl response sent"); - return; - - } - - public void multiCallBack(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackBasicServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackBasicServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackBasicServiceImpl response sent"); - return; - - } - - public void noCallBack(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - // System.out.println("CallBackBasicServiceImpl No response desired"); - return; - - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite deleted file mode 100644 index c506956088..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index adf28214f6..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/tags/java/sca/1.5.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java deleted file mode 100644 index 32c26a348a..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackBasicTestCase extends TestCase { - - private static SCADomain domain; - private CallBackBasicClient aCallBackClient; - - public void testCallBackBasic() { - aCallBackClient.run(); - } - - @Override - protected void setUp() throws Exception { - if( domain==null ) { - domain = SCADomain.newInstance("CallBackBasicTest.composite"); - } - - aCallBackClient = domain.getService(CallBackBasicClient.class, "CallBackBasicClient"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - - -} diff --git a/tags/java/sca/1.5.1/itest/callback-complex-type/pom.xml b/tags/java/sca/1.5.1/itest/callback-complex-type/pom.xml deleted file mode 100644 index 90ab9d74a9..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-complex-type/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callback-complex-type - Apache Tuscany SCA iTest Callback Complex Type - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java deleted file mode 100644 index 9fddb850ba..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/** - * - */ -public interface CallBackCTypeCallBack { - - public void callBackMessage(String aString); - - public void callBackIncrement(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java deleted file mode 100644 index 739983c277..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackCTypeClient { - - public void run(); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java deleted file mode 100644 index d2b03fcde7..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * 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.test; - -import junit.framework.Assert; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(CallBackCTypeClient.class) -public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTypeCallBack { - - @Reference - protected CallBackCTypeService aCallBackService; - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - public CallBackCTypeClientImpl() { - } - - public void run() { - - // This test is the same as the Basic Callback except it uses a - // componentType side file. - // This test currently fails because the integration test environment - // does not properly copy - // the componentType files to the target folder. This is documented in - // Tuscany-967. - - // Test12a is the basic callback where the target calls back prior to - // returning to the client. - test12a(); - - // Test12b is where the target does not call back to the client. - test12b(); - - // Test12c is where the target calls back multiple times to the client. - test12c(); - - return; - } - - private void test12a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test12a -", "Who's There", this.getReturnMessage()); - - } - - private void test12b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackBasicITest - test12b -", 1, 1); - return; - } - - private void test12c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test12c -", 3, this.getCallBackCount()); - return; - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java deleted file mode 100644 index ffbf4f35fa..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -// @Callback(CallBackCTypeCallBack.class) -/** - * - */ -public interface CallBackCTypeService { - - public void knockKnock(String aString); - - public void noCallBack(String aString); - - public void multiCallBack(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java deleted file mode 100644 index dc31ed156b..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; - -@Service(CallBackCTypeService.class) -public class CallBackCTypeServiceImpl implements CallBackCTypeService { - - @Callback - protected CallBackCTypeCallBack callback; - - public CallBackCTypeServiceImpl() { - } - - public void knockKnock(String aString) { - - System.out.println("CallBackCTypeServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackCTypeServiceImpl response sent"); - return; - - } - - public void multiCallBack(String aString) { - - System.out.println("CallBackCTypeServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackCTypeServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackCTypeServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackCTypeServiceImpl response sent"); - return; - - } - - public void noCallBack(String aString) { - - System.out.println("CallBackCTypeServiceImpl message received: " + aString); - System.out.println("CallBackCTypeServiceImpl No response desired"); - return; - - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite deleted file mode 100644 index 3f48f16389..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType deleted file mode 100644 index ff38134df5..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/tags/java/sca/1.5.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java deleted file mode 100644 index 33d1afaecd..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -//FIXME Fix this test case -public class CallBackCTypeTestCaseFIXME extends TestCase { - - private SCADomain domain; - private CallBackCTypeClient aCallBackClient; - - public void testCallBackBasic() { - aCallBackClient.run(); - } - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackCTypeClient.composite"); - - aCallBackClient = - domain.getService(CallBackCTypeClient.class, "CallBackCTypeClient"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/pom.xml b/tags/java/sca/1.5.1/itest/callback-composite-scope/pom.xml deleted file mode 100644 index bef06de1ab..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-composite-scope/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callback-composite-scope - Apache Tuscany SCA iTest Callback COMPOSITE Scope - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - - ${basedir}/../build-was-integration.xml - ${basedir}/../wasAdmin.py - - diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java deleted file mode 100644 index a5320a6492..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - */ -@Remotable -@Callback(HelloworldCallback.class) -public interface Helloworld { - - String sayHello(String name); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java deleted file mode 100644 index c37c2f57a2..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - */ -@Remotable -public interface HelloworldCallback { - - String whoIs(String name); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java deleted file mode 100644 index 0d56e440cd..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - */ -@Remotable -public interface HelloworldDelegate { - - String sayHello(String name); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java deleted file mode 100644 index aa7217eb2a..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.ComponentName; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * A HelloworldDelegate implementation. The service method invocation is delegated to a Helloworld service - * reference injected into this component. - * - * @version $Rev$ $Date$ - */ -@Scope("COMPOSITE") -@Service(interfaces = {HelloworldDelegate.class, HelloworldCallback.class}) -public class HelloworldDelegateImpl implements HelloworldDelegate, HelloworldCallback { - - @ComponentName - protected String componentName; - - @Reference - public Helloworld helloworld; - - @Property - public String salutation; - - public String sayHello(String name) { - System.out.println(componentName+": HelloworldDelegateImpl("+this+").sayHello: " + name); - return helloworld.sayHello(name); - } - - public String whoIs(String name) { - System.out.println(componentName+": HelloworldDelegateImpl("+this+").whoIs: " + name); - if(!"world".equalsIgnoreCase(name)) { - return salutation; - } else { - return ""; - } - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java deleted file mode 100644 index 8107bcf42b..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ComponentName; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * @version $Rev$ $Date$ - */ -@Service(Helloworld.class) -@Scope("COMPOSITE") -public class HelloworldImpl implements Helloworld { - - @ComponentName - protected String componentName; - - @Callback - public HelloworldCallback helloworldCallback; - - public String sayHello(String name) { - System.out.println(componentName+": HelloworldImpl("+this+").sayHello: " + name); - String msg = "Hello " + helloworldCallback.whoIs(name) + " " + name; - System.out.println("Msg: "+msg); - return msg; - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite deleted file mode 100644 index 1593c1dc23..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - Monsieur - - - - - - Mr. - - diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 65b9ca501f..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java b/tags/java/sca/1.5.1/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java deleted file mode 100644 index bd967099dc..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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.test; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class CallbackTestCase { - - private static SCADomain domain; - private HelloworldDelegate client; - private HelloworldDelegate client2; - private HelloworldCallback callback; - private HelloworldCallback callback2; - - @Test - @Ignore("TUSCANY-2823") - public void testCallbacks() { - String name = "John"; - Assert.assertEquals("Hello "+callback.whoIs(name) + " " + name, client.sayHello(name)); - Assert.assertEquals("Hello "+callback2.whoIs(name) + " " + name, client2.sayHello(name)); - } - - @Before - public void setUp() throws Exception { - if( domain == null ) { - domain = SCADomain.newInstance("HelloworldDelegate.composite"); - } - - client = domain.getService(HelloworldDelegate.class, "HelloworldDelegateComponent/HelloworldDelegate"); - callback = domain.getService(HelloworldCallback.class, "HelloworldDelegateComponent/HelloworldCallback"); - client2 = domain.getService(HelloworldDelegate.class, "HelloworldDelegateComponent2/HelloworldDelegate"); - callback2 = domain.getService(HelloworldCallback.class, "HelloworldDelegateComponent2/HelloworldCallback"); - } - - @After - public void tearDown() throws Exception { - domain.close(); - } - - -} diff --git a/tags/java/sca/1.5.1/itest/callback-id/pom.xml b/tags/java/sca/1.5.1/itest/callback-id/pom.xml deleted file mode 100644 index 050bf35f84..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-id/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callback-id - Apache Tuscany SCA iTest Callback ID - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java deleted file mode 100644 index b14560a8c3..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/** - * - */ -public interface CallBackIdCallBack { - - public void callBackMessage(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java deleted file mode 100644 index a9e551f8b4..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackIdClient { - - public void run(); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java deleted file mode 100644 index 59c9c3d069..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * 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.test; - -import junit.framework.Assert; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(CallBackIdClient.class) -public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBack { - - @Context - protected ComponentContext componentContext; - - @Reference - protected ServiceReference aCallBackService; - - private static String returnMessage = null; - private static Object monitor = new Object(); - private static Object callBackId; - - public void run() { - - // This tests the use of the set/get callbackId API both SCA generated - // and client specified. - - // Test1 uses a SCA generated callback ID and compare that with the - // callbackID returned during callback. - test11a(); - - // Test2 uses a Client specified callback ID and compare that with the - // callbackID returned during callback. - test11b(); - - return; - } - - private void test11a() { - - // Retrieve this services callback ID and save it. Once the callback is - // received the callback ID will be compared with the one - // returned. Equal is good. - - Object origCallBackId = aCallBackService.getCallbackID(); - aCallBackService.getService().knockKnock("Knock Knock - Test1"); - int count = 0; - - // - // If we cannot get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackIdITest - test11a - SCA Generated Id", origCallBackId, this.getCallBackId()); - - } - - private void test11b() { - - // Set the services callback ID and save it. Once the callback is - // received the callback ID will be compared with the one - // returned. Equal is good. - - String origCallBackId = "CallBackId1"; - aCallBackService.setCallbackID(origCallBackId); - - aCallBackService.getService().knockKnock("Knock Knock - Test2"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert - .assertEquals("CallBackIdITest - 11b - Client Specified Id", origCallBackId, (String)this.getCallBackId()); - - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public void callBackMessage(String aString) { - - System.out.println("Entering callback callBackMessage: " + aString); - RequestContext rc = componentContext.getRequestContext(); - Object callBackId = rc.getServiceReference().getCallbackID(); - - synchronized (monitor) { - this.setReturnMessage(aString); - this.setCallBackId(callBackId); - monitor.notify(); - } - } - - protected Object getCallBackId() { - return callBackId; - } - - protected void setCallBackId(Object aCallBackId) { - callBackId = aCallBackId; - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java deleted file mode 100644 index 18c592a1c1..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Callback(CallBackIdCallBack.class) -/** - * - */ -public interface CallBackIdService { - - public void knockKnock(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java deleted file mode 100644 index 8b0a4b69cf..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; - -@Service(CallBackIdService.class) -public class CallBackIdServiceImpl implements CallBackIdService { - - @Callback - protected CallBackIdCallBack callback; - @Context - protected ComponentContext compositeContext; - - public void knockKnock(String aString) { - - System.out.println("CallBackIdServiceImpl message received: " + aString); - RequestContext rc = compositeContext.getRequestContext(); - Object callBackId = rc.getServiceReference().getCallbackID(); - System.out.println("CallBackIdServiceImpl callbackID: " + callBackId); - - callback.callBackMessage("Who's There"); - System.out.println("CallBackIdServiceImpl response sent"); - return; - - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-id/src/main/resources/CallBackIdClient.composite b/tags/java/sca/1.5.1/itest/callback-id/src/main/resources/CallBackIdClient.composite deleted file mode 100644 index c9a6ba6258..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-id/src/main/resources/CallBackIdClient.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/tags/java/sca/1.5.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java deleted file mode 100644 index 771fbb8ff7..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackIdTestCase extends TestCase { - - private SCADomain domain; - private CallBackIdClient aCallBackClient; - - public void testCallBackBasic() { - aCallBackClient.run(); - } - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackIdClient.composite"); - - aCallBackClient = domain.getService(CallBackIdClient.class, "CallBackIdClient"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-multiple-wires/pom.xml b/tags/java/sca/1.5.1/itest/callback-multiple-wires/pom.xml deleted file mode 100644 index b2ad4a3c39..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-multiple-wires/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callback-multiple-wires - Apache Tuscany SCA iTest Callback With Mutiple Wires - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java deleted file mode 100644 index 7c80d222fc..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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.test.callback; - -/** - * The client interface - */ -public interface MyClient { - - void aClientMethod(); -} diff --git a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java deleted file mode 100644 index df91f3d268..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.test.callback; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Demonstrates a component-to-component callback invocation - */ -@Service(MyClient.class) -@Scope("COMPOSITE") -public class MyClientImpl1 implements MyClient, MyServiceCallback { - - private MyService myService; - static String result; - - @Reference - public void setMyService(MyService myService) { - this.myService = myService; - } - - public void aClientMethod() { - myService.someMethod("-> someMethod1"); - } - - public void receiveResult(String result) { - System.out.println("Work thread " + Thread.currentThread()); - System.out.println("Result: " + result); - MyClientImpl1.result = result; - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java deleted file mode 100644 index a0a9564002..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.test.callback; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Demonstrates a component-to-component callback invocation - */ -@Service(MyClient.class) -@Scope("COMPOSITE") -public class MyClientImpl2 implements MyClient, MyServiceCallback { - - private MyService myService; - static String result; - - @Reference - public void setMyService(MyService myService) { - this.myService = myService; - } - - public void aClientMethod() { - myService.someMethod("-> someMethod2"); - } - - public void receiveResult(String result) { - System.out.println("Work thread " + Thread.currentThread()); - System.out.println("Result: " + result); - MyClientImpl2.result = result; - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java deleted file mode 100644 index cfd601f546..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.test.callback; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; - -/** - * This service that will be invoked in a non-blocking fashion - */ -@Callback(MyServiceCallback.class) -public interface MyService { - - @OneWay - void someMethod(String arg); -} diff --git a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java deleted file mode 100644 index f198efae51..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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.test.callback; - -/** - * The callback interface for {@link MyService}. - */ -public interface MyServiceCallback { - - void receiveResult(String result); -} diff --git a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java deleted file mode 100644 index d19b3fe355..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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.test.callback; - -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * This class implements MyService and uses a callback. - */ -@Service(MyService.class) -@Scope("COMPOSITE") -public class MyServiceImpl implements MyService { - - @Context - protected RequestContext requestContext; - - public void someMethod(String arg) { - // invoke the callback - try { - MyServiceCallback myServiceCallback = requestContext.getCallback(); - myServiceCallback.receiveResult(arg + " -> receiveResult"); - } catch(RuntimeException e) { - System.out.println("RuntimeException invoking receiveResult: " + e.toString()); - } - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite deleted file mode 100644 index 3dae3ca3a8..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java deleted file mode 100644 index 3c83e4bedd..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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.test.callback; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * A TestCase that demonstrates resolving the client service and initiating the callback sequence - */ -public class CallbackMultiWireTestCase extends TestCase { - - private SCADomain scaDomain; - private MyClient myClient1; - private MyClient myClient2; - - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("CallbackMultiWireTest.composite"); - myClient1 = scaDomain.getService(MyClient.class, "MyClientComponent1"); - myClient2 = scaDomain.getService(MyClient.class, "MyClientComponent2"); - } - - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void test() throws Exception { - System.out.println("Main thread " + Thread.currentThread()); - myClient1.aClientMethod(); - myClient2.aClientMethod(); - System.out.println("Sleeping ..."); - Thread.sleep(300); - assertEquals("-> someMethod1 -> receiveResult", MyClientImpl1.result); - assertEquals("-> someMethod2 -> receiveResult", MyClientImpl2.result); - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-separatethread/pom.xml b/tags/java/sca/1.5.1/itest/callback-separatethread/pom.xml deleted file mode 100644 index 9635fe1dd4..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-separatethread/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callback-separatethread - Apache Tuscany SCA iTest Callback Using Separate Thread - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java deleted file mode 100644 index f812a39058..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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 org.osoa.sca.annotations.Remotable; - -/** - * This is the client interface for the call backs in a separate thread tests - */ -@Remotable -public interface CallBackSeparateThreadClient { - - /** - * This tests call back patterns using separate threads. - */ - void runTests(); -} diff --git a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java deleted file mode 100644 index e861f8a3d1..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * 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.util.concurrent.atomic.AtomicInteger; - -import junit.framework.Assert; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * This is the client implementation for the call backs in a separate thread tests - */ -@Service(CallBackSeparateThreadClient.class) -public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadClient, EventProcessorCallBack { - /** - * Used to sleep for 60 seconds. - */ - private static final int SIXTY_SECONDS = 60 * 1000; - - /** - * Counts the number of one second call backs - */ - private static final AtomicInteger oneSecondCallbackCount = new AtomicInteger(); - - /** - * Counts the number of five second call backs - */ - private static final AtomicInteger fiveSecondCallbackCount = new AtomicInteger(); - - /** - * This is our injected reference to the EventProcessorService - */ - @Reference - protected EventProcessorService aCallBackService; - - /** - * This tests call back patterns using separate threads. - */ - public void runTests() { - // Register for 1 second call back - registerFor1SecondCallback(); - - // Wait for a few 1 second call backs - System.out.println("Waiting for some 1 second calls"); - waitForSome1SecondCallbacks(); - - // Register for 5 second call back - registerFor5SecondCallback(); - - // Wait for a few 1 second call backs - System.out.println("Waiting for some 1 second calls"); - waitForSome1SecondCallbacks(); - - // Wait for a few 5 second call backs - System.out.println("Waiting for some 5 second calls"); - waitForSome5SecondCallbacks(); - - System.out.println("Done"); - } - - /** - * Waits for some one second call backs to be fired - */ - private void waitForSome1SecondCallbacks() { - // Reset the one second call back count - oneSecondCallbackCount.set(0); - - // Wait until we have 10 1 second call backs or 60 seconds has passed - final long start = System.currentTimeMillis(); - do { - if (oneSecondCallbackCount.get() >= 10) { - System.out.println("Received enough 1 second notifications"); - return; - } - - try { - Thread.sleep(500); - } catch (InterruptedException e) { - Assert.fail("Unexpeceted exception " + e); - } - } - while (System.currentTimeMillis() - start < SIXTY_SECONDS); - - // If we get to here then we did not receive enough events - Assert.fail("Did not receive enough 1 second events"); - } - - /** - * Waits for some five second call backs to be fired - */ - private void waitForSome5SecondCallbacks() { - // Reset the five second call back count - fiveSecondCallbackCount.set(0); - - // Wait until we have 4 5 second call backs or 60 seconds has passed - final long start = System.currentTimeMillis(); - do - { - if (fiveSecondCallbackCount.get() >= 4) { - System.out.println("Received enough 5 second notifications"); - return; - } - - try - { - Thread.sleep(500); - } - catch (InterruptedException e) - { - Assert.fail("Unexpeceted exception " + e); - } - } - while (System.currentTimeMillis() - start < SIXTY_SECONDS); - - // If we get to here then we did not receive enough events - Assert.fail("Did not receive enough 5 second events"); - } - - /** - * Register to receive one second call backs - */ - private void registerFor1SecondCallback() { - aCallBackService.registerForEvent("ONE"); - return; - } - - /** - * Register to receive five second call backs - */ - private void registerFor5SecondCallback() { - aCallBackService.registerForEvent("FIVE"); - } - - /** - * Method that is called when an Event is delivered. - * - * @param aEventName The name of the Event - * @param aEventData The Event data - */ - public void eventNotification(String aEventName, Object aEventData) { - // System.out.println("Received Event : " + aEventName + " " + aEventData); - - if (aEventName.equals("ONE")) { - final int newValue = oneSecondCallbackCount.incrementAndGet(); - //System.out.println("Received total of " + newValue + " 1 second call backs"); - } else if (aEventName.equals("FIVE")) { - final int newValue = fiveSecondCallbackCount.incrementAndGet(); - //System.out.println("Received total of " + newValue + " 5 second call backs"); - } - else - System.out.println("Unknown event type of " + aEventName); - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java deleted file mode 100644 index ae41f596fc..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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 org.osoa.sca.annotations.Remotable; - -/** - * The call back interface for the EventProcessorService that is implemented - * by the client to receive event notifications - */ -@Remotable -public interface EventProcessorCallBack { - /** - * Call back notifying client of an Event - * - * @param aEventName The name of the Event - * @param aEventData The data for the Event - */ - void eventNotification(String aEventName, Object aEventData); -} diff --git a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java deleted file mode 100644 index c22b8cceec..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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 org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.Remotable; - - -/** - * Sample Event Processor Service - */ -@Conversational -@Callback(EventProcessorCallBack.class) -@Remotable -public interface EventProcessorService { - - /** - * Registers the client to receive notifications for the specified event - * - * @param aEventName The name of the Event to register - */ - void registerForEvent(String aEventName); - - /** - * Unregisters the client so it no longer receives notifications for the specified event - * - * @param aEventName The name of the Event to unregister - */ - void unregisterForEvent(String aEventName); -} diff --git a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java deleted file mode 100644 index 4d672b3a8b..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java +++ /dev/null @@ -1,197 +0,0 @@ -/* - * 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.util.Map; -import java.util.Timer; -import java.util.TimerTask; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Sample Event Processor Service Implementation - */ -@Service(EventProcessorService.class) -@Scope("CONVERSATION") -public class EventProcessorServiceImpl implements EventProcessorService { - - /** - * Reference to the call back - */ - @Callback - protected CallableReference clientCallback; - - /** - * This map contains the call backs for each of the registered Event names - */ - private final Map> eventListeners; - - /** - * The list of all Event Generators we create - */ - private final EventGenerator[] allEventGenerators; - - /** - * Constructor. Starts the Event Generators - */ - public EventProcessorServiceImpl() { - eventListeners = new ConcurrentHashMap>(); - - // We will simulate an Event generator - allEventGenerators = new EventGenerator[2]; - allEventGenerators[0] = new EventGenerator("ONE", 1); // Generate the SECOND event every second - allEventGenerators[1] = new EventGenerator("FIVE", 5); // Generate the FIVE event every 5 seconds - } - - /** - * Registers the client to receive notifications for the specified event - * - * @param aEventName The name of the Event to register - */ - public void registerForEvent(String aEventName) - { - // Register for the Event - eventListeners.put(aEventName, clientCallback); - - // Send the "register" started event to the client - receiveEvent(aEventName, "SameThread: Registered to receive notifications for " + aEventName); - } - - /** - * Unregisters the client so it no longer receives notifications for the specified event - * - * @param aEventName The name of the Event to unregister - */ - public void unregisterForEvent(String aEventName) - { - // Send the "register" started event to the client - receiveEvent(aEventName, "SameThread: Unregister from receiving notifications for " + aEventName); - - eventListeners.remove(aEventName); - } - - /** - * This method is called whenever the EventProcessorService receives an Event - * - * @param aEventName The name of the Event received - * @param aEventData The Event data - */ - private void receiveEvent(String aEventName, Object aEventData) - { - // Get the listener for the Event - final CallableReference callback = eventListeners.get(aEventName); - if (callback == null) - { - //System.out.println("No registered listeners for " + aEventName); - return; - } - - // Trigger the call back - // System.out.println("Notifying " + callback + " of event " + aEventName); - callback.getService().eventNotification(aEventName, aEventData); - // System.out.println("Done notify " + callback + " of event " + aEventName); - } - - /** - * Shuts down the Event Processor - */ - @Destroy - public void shutdown() - { - System.out.println("Shutting down the EventProcessor"); - - // Clear list of call back locations as we don't want to send any more notifications - eventListeners.clear(); - - // Stop the Event Generators - for (EventGenerator generator : allEventGenerators) - { - generator.stop(); - } - } - - /** - * Utility class for generating Events - */ - private class EventGenerator - { - /** - * The Timer we are using to generate the events - */ - private final Timer timer = new Timer(); - - /** - * Constructor - * - * @param aEventName The name of the Event to generate - * @param frequencyInSeconds How frequently we should generate the Events - */ - private EventGenerator(String aEventName, int frequencyInSeconds) - { - timer.schedule(new EventGeneratorTimerTask(aEventName), - frequencyInSeconds * 1000, frequencyInSeconds * 1000); - } - - /** - * Stop this Event Generator - */ - private void stop() - { - timer.cancel(); - } - - /** - * The TimerTask that is invoked by the Timer for the EventGenerator - */ - private class EventGeneratorTimerTask extends TimerTask - { - /** - * The name of the Event we should generate - */ - private final String eventName; - - /** - * Constructor - * - * @param aEventName The name of the Event we should generate - */ - private EventGeneratorTimerTask(String aEventName) - { - eventName = aEventName; - } - - /** - * Timer calls this method and it will generate an Event - */ - @Override - public void run() - { - // System.out.println("Generating new event " + eventName); - receiveEvent(eventName, "Separate Thread Notification: " + UUID.randomUUID().toString()); - } - } - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite deleted file mode 100644 index e111e5074c..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/tags/java/sca/1.5.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java deleted file mode 100644 index f7e7be2133..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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 junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This test case will attempt to trigger a call back using a separate thread - */ -public class CallBackSeparateThreadTestCase extends TestCase { - - /** - * The SCADomain we are using - */ - private SCADomain domain; - - /** - * The client the tests should use - */ - private CallBackSeparateThreadClient aCallBackClient; - - /** - * Run the call back in separate thread tests - */ - public void testCallBackSeparateThread() { - aCallBackClient.runTests(); - } - - /** - * Load the Call back in separate thread composite and look up the client. - */ - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackSeparateThreadTest.composite"); - aCallBackClient = domain.getService(CallBackSeparateThreadClient.class, "CallBackSeparateThreadClient"); - } - - /** - * Shutdown the SCA domain - */ - @Override - protected void tearDown() throws Exception { - domain.close(); - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/pom.xml b/tags/java/sca/1.5.1/itest/callback-set-callback/pom.xml deleted file mode 100644 index ca7b5f2ca7..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callback-set-callback - Apache Tuscany SCA iTest Set Callback - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java deleted file mode 100644 index 3b9599f53f..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Callback; - -// @Remotable -@Callback(CallBackSetCallbackCallback.class) -/** - * - */ -public interface CallBackSetCalbackService { - - public void knockKnock(String aString); - - public boolean setCallbackIllegally(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java deleted file mode 100644 index 48752f2ea1..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.test; - -import junit.framework.Assert; - -public class CallBackSetCallbackBadCallback { - - public CallBackSetCallbackBadCallback() { - super(); - } - - public void callback(String aString) { - // - // This callback method should never be called. - // - System.out.println("CallBackSetCallbackBadCallback: callback called"); - Assert.fail("CallBackSetCallbackBadCallback: callback called"); - return; - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java deleted file mode 100644 index ad0e0603a3..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.test; - -// @Remotable -/** - * - */ -public interface CallBackSetCallbackCallback { - - public void callBackMessage(String aString); - - public void callBackIncrement(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java deleted file mode 100644 index 0a22b0e01f..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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.test; - -import java.io.File; - -import org.osoa.sca.annotations.Service; - -@Service(CallBackSetCallbackCallback.class) -public class CallBackSetCallbackCallbackImpl implements CallBackSetCallbackCallback { - - private static String returnMessage = null; - private static int callBackCount = 0; - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - - System.out.println("Entering CallBackSetCallbackCallbackImpl callBackMessage: " + aString); - - File aFile = new File("target/test4_marker"); - try { - aFile.createNewFile(); - } catch (Exception ex) { - System.out.println("Error Creating target/test4_marker marker file"); - ex.printStackTrace(); - } - - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - this.incrementCallBackCount(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java deleted file mode 100644 index 94cb6aa73b..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackSetCallbackClient { - - public void run(); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java deleted file mode 100644 index 66e4d3fc05..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * 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.test; - -import java.io.File; - -import junit.framework.Assert; - -import org.osoa.sca.NoRegisteredCallbackException; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(CallBackSetCallbackClient.class) -public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient { - - @Reference - protected ServiceReference aCallBackService; - @Reference - protected ServiceReference callBack; - - public void run() { - - // This test various aspects of the setCallback() API in a stateless - // scope. - - /* - * test4 Client does not implement the callback interface but calls - * setCallback with a service reference before invoking the target, - * Verify successful execution. - */ - - test4(); - - /* - * test5 The client does not implement the callback interface and does - * not call setCallback() before invoking the target. Verify a - * NoRegisteredCallbackException is thrown. - */ - - test5(); - - /* - * test6() The client calls setCallback() with an object that is not a - * service reference and the callback interface is stateless. Verify - * that an appropriate exception is thrown. When calling setCallback - * with an object the interface must be stateful. Stateless interfaces - * require a service Reference. - */ - - test6(); - - /* - * test10 The target calls setCallback() on its own service reference, - * e.g. getRequestContext().getServiceReference().getCallback(). Verify - * an appropriate exception occurs. - */ - - test10(); - - return; - } - - private void test4() { - - // - // Since callbacks do not synchronously return and this test results in - // a callback to a component other - // than this client I am using a marker file to determine the outcome. - // The presence of the marker - // file will be used for the Assertion test. If it exists then the - // callback occurred and all is good. - // - - // Make sure the marker file is not present before starting the test. - File aFile = new File("target/test4_marker"); - if (aFile.exists()) - aFile.delete(); - - aCallBackService.setCallback(callBack); - - aCallBackService.getService().knockKnock("Knock Knock"); - - // Lets give the callback a little time to complete.... - - int count = 0; - long timeout = 1000; - - while (count++ < 30 && (aFile.exists() == false)) { - try { - Thread.sleep(timeout); - } catch (InterruptedException ie) { - } - } - - Assert.assertEquals("CallBackSetCallback - Test4", true, aFile.exists()); - - aCallBackService.setCallback(null); // leave this in the default state for next test - - } - - private void test5() { - - boolean correctException = false; - - // - // The backend service is expecting a callback reference to be set. This - // test will not - // set one so an exception is expected. According to the spec if a - // client calls a method on - // a service reference prior to calling setCallback() then a - // NoRegisteredCallbackException - // will be thrown on the client. - // - - try { - aCallBackService.getService().knockKnock("Knock Knock"); - } catch (NoRegisteredCallbackException NotRegEx) { - correctException = true; - } catch (Exception ex) { - ex.printStackTrace(); - } - - Assert.assertEquals("CallBackSetCallback - Test5", true, correctException); - - } - - private void test6() { - - boolean correctException = false; - - // - // This test is to specify an Object that is not a service reference - // that does implement - // the callback interface. However because this callback service is - // stateless the expected - // result is an appropriate exception. - // - - try { - aCallBackService.setCallback(new CallBackSetCallbackObjectCallback()); - aCallBackService.getService().knockKnock("Knock Knock"); - } - // - // This should catch an appropriate exception. - // - catch (IllegalArgumentException goodEx) { - correctException = true; - } catch (Exception ex) { - ex.printStackTrace(); - } - - Assert.assertEquals("CallBackSetCallback - Test6", true, correctException); - - } - - private void test10() { - - // - // The appropriate exception should be thrown and caught on the service side. - // If this happens, the setCallbackIllegally() method will return true. - // If not, this method will return false. - // - - aCallBackService.setCallback(callBack); // ensure no client-side exception - - boolean result = aCallBackService.getService().setCallbackIllegally - ("Try to set callback on your own service reference"); - - Assert.assertEquals("CallBackSetCallback - Test10", true, result); - - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java deleted file mode 100644 index afedcdf7f1..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.test; - -public class CallBackSetCallbackObjectCallback implements CallBackSetCallbackCallback { - - private int callBackCount = 0; - - public CallBackSetCallbackObjectCallback() { - super(); - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - - System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString); - - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - this.incrementCallBackCount(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java deleted file mode 100644 index 4a6c9dbaa6..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; - -@Service(CallBackSetCalbackService.class) -public class CallBackSetCallbackServiceImpl implements CallBackSetCalbackService { - - @Callback - protected CallBackSetCallbackCallback callback; - @Context - protected ComponentContext context; - - public void knockKnock(String aString) { - - try { - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackBasicServiceImpl response sent"); - return; - } catch (Exception ex) { - ex.printStackTrace(); - } - - } - - public boolean setCallbackIllegally(String aString) { - - System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString); - - boolean exceptionProduced = false; - RequestContext requestContext = null; - ServiceReference serviceRef = null; - - try { - requestContext = context.getRequestContext(); - serviceRef = (ServiceReference) requestContext.getServiceReference(); - serviceRef.setCallback(serviceRef); - } catch (ClassCastException goodEx) { - exceptionProduced = true; - System.out.println("Test10 appropriate exception caught during setCallback to own service reference"); - } catch (Exception badEx) { - System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() " + badEx.toString()); - badEx.printStackTrace(); - } - - // Return a flag indicating whether we got the exception we are looking for - return exceptionProduced; - - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite deleted file mode 100644 index 3552ddecab..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/tags/java/sca/1.5.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java deleted file mode 100644 index 496ae0b1a5..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -//FIXME Fix this test case -public class CallBackSetCallbackTestCase extends TestCase { - - private SCADomain domain; - private CallBackSetCallbackClient aCallBackClient; - - public void testCallBackSetCallback() { - aCallBackClient.run(); - } - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackSetCallbackTest.composite"); - - aCallBackClient = - domain.getService(CallBackSetCallbackClient.class, - "CallBackSetCallbackClient"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/pom.xml b/tags/java/sca/1.5.1/itest/callback-set-conversation/pom.xml deleted file mode 100644 index 335cd6feab..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-callback-set-conversation - Apache Tuscany SCA iTest Callback Set Conversation - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java deleted file mode 100644 index d97c69eaed..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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.test; - -import java.io.Serializable; - -import junit.framework.Assert; - -public class CallBackSetCallbackConvBadCallback implements Serializable { - - public CallBackSetCallbackConvBadCallback() { - super(); - } - - public void callback(String aString) { - // - // This callback method should never be called. - // - System.out.println("CallBackSetCallbackBadCallback: callback called"); - Assert.fail("CallBackSetCallbackConvBadCallback: callback called"); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java deleted file mode 100644 index a704fd0ece..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Conversational; - -// @Remotable -@Conversational -/** - * - */ -public interface CallBackSetCallbackConvCallback { - - public void callBackMessage(String aString); - - public void callBackIncrement(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java deleted file mode 100644 index 013424bf5e..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CallBackSetCallbackConvClient { - - public void run(); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java deleted file mode 100644 index 5d692e7728..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * 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.test; - -import junit.framework.Assert; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(CallBackSetCallbackConvClient.class) -@Scope("CONVERSATION") -public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackConvClient { - - @Context - protected ComponentContext componentContext; - - @Reference - protected CallBackSetCallbackConvService aCallBackService; - - private CallBackSetCallbackConvObjectCallback aCallbackObject = null; - - public void run() { - - // This tests aspects of the setCallback() API within a conversational - // scope. - - /* - * test7 The client calls setCallback() with an object that is not a - * service reference and the callback interface is stateful. Verify - * successful execution. - */ - test7(); - - /* - * test8() The client calls setCallback() with an object that does not - * implement the callback interface. Verify an appropriate exception is - * thrown. This requires a STATEFUL interface. - */ - test8(); - - /* - * test9 The client calls setCallback() with an object that is not - * Serializable. Verify an appropriate exception is thrown. This - * requires a STATEFUL callback interface. Move from the stateless test - * case. - */ - test9(); - - return; - } - - private void test7() { - - // - // This test is to specify an Object that is not a service reference - // that does implement - // the callback interface and is Serializable. Verify successful - // execution. - // - - aCallbackObject = new CallBackSetCallbackConvObjectCallback(); - aCallbackObject.incrementCallBackCount(); - - ServiceReference aCallBackServiceRef - = componentContext.cast(aCallBackService); - aCallBackServiceRef.setCallback(aCallbackObject); - aCallBackService.knockKnock("Knock Knock 7"); - - Assert.assertEquals("CallBackSetCallbackConv - Test7", 2, aCallbackObject.getCount()); - - } - - private void test8() { - - boolean correctException = false; - - // - // This test is to specify an Object that is not a service reference - // that does not implement - // the callback interface. The expected result is an appropriate - // exception. - // - - try { - ServiceReference aCallBackServiceRef - = componentContext.cast(aCallBackService); - aCallBackServiceRef.setCallback(new CallBackSetCallbackConvBadCallback()); - aCallBackService.knockKnock("Knock Knock 8"); - } - - // - // This should catch an appropriate exception. - // - - catch (IllegalArgumentException goodEx) - { - System.out.println("correct exception " + goodEx); - correctException = true; - } - - catch (Exception ex) { - // This means an inappropriate exception occurred - ex.printStackTrace(); - } - - Assert.assertEquals("CallBackSetCallbackConv - Test8", true, correctException); - - } - - private void test9() { - - boolean correctException = false; - - // - // This test is to specify an Object that is not a service reference - // that does implement - // the callback interface but does not implement Serializable. Verify - // an appropriate exception - // is thrown. - // - - try { - ServiceReference aCallBackServiceRef - = componentContext.cast(aCallBackService); - aCallBackServiceRef.setCallback(new CallBackSetCallbackConvNonSerCallback()); - aCallBackService.knockKnock("Knock Knock 9"); - } - // - // This should catch an appropriate exception. - // - catch (IllegalArgumentException goodEx) - { - System.out.println("correct exception " + goodEx); - correctException = true; - } catch (Exception ex) { - ex.printStackTrace(); - } - - Assert.assertEquals("CallBackSetCallbackConv - Test9", true, correctException); - - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java deleted file mode 100644 index 75a4a3a6a0..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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.test; - -import junit.framework.Assert; - -public class CallBackSetCallbackConvNonSerCallback implements CallBackSetCallbackConvCallback { - - private int callBackCount = 0; - - public CallBackSetCallbackConvNonSerCallback() { - super(); - } - - public synchronized void incrementCallBackCount() { - callBackCount++; - } - - public synchronized int getCount() { - return callBackCount; - } - - public void callBackMessage(String aString) { - // - // This callback method should never be called. - // - System.out.println("Entering CallBackSetCallbackConvNonSerCallback callBackMessage: " + aString); - Assert.fail("CallBackSetCallbackConvNonSerCallback: callbackMessage called"); - } - - public void callBackIncrement(String aString) { - // - // This callback method should never be called. - // - System.out.println("Entering callbackIncrement: " + aString); - this.incrementCallBackCount(); - Assert.fail("CallBackSetCallbackConvNonSerCallback: callbackIncrement called"); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java deleted file mode 100644 index e7a3b144f6..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.test; - -import java.io.Serializable; - -public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable -{ - private int callBackCount = 0; - - public CallBackSetCallbackConvObjectCallback() { - super(); - } - - public synchronized void incrementCallBackCount() { - callBackCount++; - } - - public synchronized int getCount() { - return callBackCount; - } - - public void callBackMessage(String aString) { - - System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString); - - } - - public void callBackIncrement(String aString) { - - System.out.println("Entering callback increment: " + aString); - - this.incrementCallBackCount(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java deleted file mode 100644 index 692b6dfc35..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; - -// @Remotable -@Conversational -@Callback(CallBackSetCallbackConvCallback.class) -/** - * - */ -public interface CallBackSetCallbackConvService { - - public void knockKnock(String aString); - - public void setCallbackIllegally(String aString); - -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java deleted file mode 100644 index bca94ce407..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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.test; - -import java.io.File; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.RequestContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(CallBackSetCallbackConvService.class) -@Scope("CONVERSATION") -public class CallBackSetCallbackConvServiceImpl implements CallBackSetCallbackConvService { - - @Callback - protected CallBackSetCallbackConvCallback callback; - @Context - protected ComponentContext context; - - public void knockKnock(String aString) { - - System.out.println("CallBackSetCallbackConvServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - callback.callBackIncrement("This should do it"); - System.out.println("CallBackSetCallbackConvServiceImpl response sent"); - - } - - public void setCallbackIllegally(String aString) { - - System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString); - - boolean exceptionProduced = false; - RequestContext requestContext = null; - ServiceReference serviceRef = null; - - // Context is not working properly so we can't trust that this is - // working..... - try { - requestContext = context.getRequestContext(); - serviceRef = (ServiceReference) requestContext.getServiceReference(); - } catch (Exception ex) { - System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() " + ex.toString()); - ex.printStackTrace(); - return; - } - - // Ok, call setCallback with my own service reference. - try { - serviceRef.setCallback(serviceRef); - } catch (NullPointerException npe) { - // This is not an appropriate exception. - System.out.println("Test10 NPE exception during setCallback to own service reference"); - npe.printStackTrace(); - return; - } - // This needs to catch the appropriate exception, once we figure out - // what is needs to be! - catch (Exception ex) { - exceptionProduced = true; - System.out.println("Test10 appropriate exception caught during setCallback to own service reference"); - } - ; - - // If we get the exception we are looking for then create the marker - // file. - if (exceptionProduced == true) { - File aFile = new File("target/test10_marker"); - try { - aFile.createNewFile(); - } catch (Exception ex) { - System.out.println("Error Creating target/test10_marker marker file"); - ex.printStackTrace(); - } - } - - } -} diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite deleted file mode 100644 index ce73417f94..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/tags/java/sca/1.5.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java deleted file mode 100644 index 45bdaea9ab..0000000000 --- a/tags/java/sca/1.5.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackSetCallbackConvTestCase extends TestCase { - - private SCADomain domain; - private CallBackSetCallbackConvClient aCallBackClient; - - public void testCallBackSetCallback() { - aCallBackClient.run(); - } - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackSetCallbackConvTest.composite"); - - aCallBackClient = - domain.getService(CallBackSetCallbackConvClient.class, - "CallBackSetCallbackConvClient"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/pom.xml b/tags/java/sca/1.5.1/itest/component-type/pom.xml deleted file mode 100644 index 572f248894..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-component-type - Apache Tuscany SCA iTest Component Type - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - - diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddService.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddService.java deleted file mode 100644 index 188451ebac..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 calculator; - -/** - * The Add service interface - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 8b6fe066a6..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - return n1 + n2; - } - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 08afd922b3..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 calculator; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - - SCADomain scaDomain = SCADomain.newInstance("Calculator.composite"); - - CalculatorService calculatorService = - scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService"); - - // Calculate - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - scaDomain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 031fa8b912..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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 calculator; - - -/** - * The Calculator service interface. - */ -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index 1209ac128a..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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 calculator; - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - public void setAddService(AddService addService) { - this.addService = addService; - } - - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - public double add(double n1, double n2) { - return addService.add(n1, n2); - } - - public double subtract(double n1, double n2) { - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return divideService.divide(n1, n2); - } - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideService.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideService.java deleted file mode 100644 index 30d248208b..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 calculator; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index f7ac0b7287..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 calculator; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - return n1 / n2; - } - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index b7dca792b2..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 calculator; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - return n1 * n2; - } - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractService.java deleted file mode 100644 index bf0d1882b6..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 calculator; - -/** - * The interface for the multiply service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 77b128ab8d..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 calculator; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - return n1 - n2; - } - -} diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/Calculator.composite b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/Calculator.composite deleted file mode 100644 index b229787657..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/Calculator.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType deleted file mode 100644 index 00c48e5a35..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType deleted file mode 100644 index 74bedc0a98..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType deleted file mode 100644 index 289fcc3e11..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType deleted file mode 100644 index 2d8a879cda..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType deleted file mode 100644 index 6214955141..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/tags/java/sca/1.5.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 08fc8e33bf..0000000000 --- a/tags/java/sca/1.5.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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 calculator; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This shows how to test the Calculator service component. - */ -public class CalculatorTestCase extends TestCase { - - private CalculatorService calculatorService; - private SCADomain scaDomain; - - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("Calculator.composite"); - calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService"); - } - - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void testCalculator() throws Exception { - // Calculate - assertEquals(calculatorService.add(3, 2), 5.0); - assertEquals(calculatorService.subtract(3, 2), 1.0); - assertEquals(calculatorService.multiply(3, 2), 6.0); - assertEquals(calculatorService.divide(3, 2), 1.5); - - } -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/build-jar.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/build-jar.xml deleted file mode 100644 index 299ce6864f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/build-jar.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/pom.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/pom.xml deleted file mode 100644 index ca54eca210..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/pom.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-classloader-classes - Apache Tuscany Contribution ClassLoader Test : Contribution Classes - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - junit - junit - 4.5 - test - - - - - - itest-contribution-classloader-classes - - - org.apache.maven.plugins - maven-antrun-plugin - 1.1 - - - - ant - ant-trax - 1.6.5 - - - - - - create-jar - generate-test-sources - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java deleted file mode 100644 index 814c38777a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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 supplychain.customer; - -import org.osoa.sca.annotations.OneWay; - -/** - * This is the business interface of the Customer service component. - */ -public interface Customer { - - public void purchaseGoods(); - - @OneWay - public void notifyShipment(String order); - - public int outstandingOrderCount(); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java deleted file mode 100644 index e4daf0ec02..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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 supplychain.customer; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.retailer.Retailer; - -/** - * This class implements the Customer service component (POJO implementation). - */ -@Service(Customer.class) -@Scope("COMPOSITE") -public class JavaCustomerComponentImpl implements Customer { - - private static int outstandingOrderCount; - - private Retailer retailer; - - public JavaCustomerComponentImpl() { - System.out.println("Created " + this.getClass().getName() + - " using: " + this.getClass().getClassLoader()); - } - - @Reference - public void setRetailer(Retailer retailer) { - this.retailer = retailer; - } - - public void purchaseGoods() { - outstandingOrderCount++; - retailer.submitOrder("Order"); - } - - public void notifyShipment(String order) { - outstandingOrderCount--; - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - public int outstandingOrderCount() { - return outstandingOrderCount; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java deleted file mode 100644 index e4b3bc7048..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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 supplychain.illegal; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.customer.Customer; -import supplychain.retailer.JavaRetailerComponentImpl; -import supplychain.retailer.Retailer; -import supplychain.warehouse.JavaWarehouseComponentImpl; -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Customer service component (POJO implementation). - */ -@Service(Customer.class) -@Scope("COMPOSITE") -public class JavaCustomerComponentImpl implements Customer { - - private static int outstandingOrderCount; - - private Retailer retailer; - - public JavaCustomerComponentImpl() { - System.out.println("Created " + this.getClass().getName() + - " using: " + this.getClass().getClassLoader()); - } - - @Reference - public void setRetailer(Retailer retailer) { - this.retailer = retailer; - } - - public void purchaseGoods() { - - Retailer retailerImpl = new JavaRetailerComponentImpl(); - System.out.println("Created a retailer from Customer " + retailerImpl); - - Warehouse warehouseImpl = new JavaWarehouseComponentImpl(); - System.out.println("Created a warehouse from Customer " + warehouseImpl); - - outstandingOrderCount++; - retailer.submitOrder("Order"); - } - - public void notifyShipment(String order) { - outstandingOrderCount--; - System.out.print("Work thread " + Thread.currentThread() + " - "); - System.out.println(order); - } - - public int outstandingOrderCount() { - return outstandingOrderCount; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java deleted file mode 100644 index 698aa2aa5d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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 supplychain.retailer; - - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.warehouse.Warehouse; - -/** - * This class implements the Retailer service component (POJO implementation). - */ -@Service(Retailer.class) -@Scope("STATELESS") -public class JavaRetailerComponentImpl implements Retailer { - - private Warehouse warehouse; - - public JavaRetailerComponentImpl() { - System.out.println("Created " + this.getClass().getName() + - " using: " + this.getClass().getClassLoader()); - } - - @Reference - public void setWarehouse(Warehouse warehouse) { - this.warehouse = warehouse; - } - - - public Warehouse getWarehouse() { - return warehouse; - } - - public void submitOrder(String order) { - - warehouse.fulfillOrder(order + ", submitted"); - - } - - - - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java deleted file mode 100644 index 1e87d59af1..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 supplychain.retailer; - -/** - * This is the business interface of the Retailer service component. - */ -public interface Retailer { - - public void submitOrder(String order); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java deleted file mode 100644 index 9e01f00a79..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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 supplychain.shipper; - - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -import supplychain.customer.Customer; - -/** - * This class implements the Shipper service component (POJO implementation). - */ -@Service(Shipper.class) -@Scope("COMPOSITE") -public class JavaShipperComponentImpl implements Shipper { - - private Customer customer; - - public JavaShipperComponentImpl() { - System.out.println("Created " + this.getClass().getCanonicalName() + - " using: " + this.getClass().getClassLoader()); - } - - @Reference - public void setCustomer(Customer customer) { - this.customer = customer; - } - - public void processShipment(String order) { - customer.notifyShipment(order + ", shipped"); - } - - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java deleted file mode 100644 index 2514928c10..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 supplychain.shipper; - -/** - * This is the business interface of the Shipper service component. - */ -public interface Shipper { - - public void processShipment(String order); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java deleted file mode 100644 index cdd12d589d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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 supplychain.warehouse; - -import org.osoa.sca.annotations.Scope; - -import supplychain.shipper.Shipper; - -/** - * This class implements the Warehouse service component (POJO implementation). - */ -@Scope("STATELESS") -public class JavaWarehouseComponentImpl implements Warehouse { - - private Shipper shipper; - - public JavaWarehouseComponentImpl() { - System.out.println("Created " + this.getClass().getCanonicalName() + - " using: " + this.getClass().getClassLoader()); - } - - public void setShipper(Shipper shipper) { - this.shipper = shipper; - } - - public void fulfillOrder(String order) { - shipper.processShipment(order + ", fulfilled"); - } - - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java deleted file mode 100644 index 6f1f6b8730..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 supplychain.warehouse; - -/** - * This is the business interface of the Warehouse service component. - */ -public interface Warehouse { - - public void fulfillOrder(String order); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml deleted file mode 100644 index 714d1826e1..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml deleted file mode 100644 index 7f7dc969e2..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml deleted file mode 100644 index 7f7dc969e2..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml deleted file mode 100644 index 8a2bec308f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml deleted file mode 100644 index c77c4c1c7e..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml deleted file mode 100644 index 210a68011f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml deleted file mode 100644 index d118cceef9..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml deleted file mode 100644 index d37b6659da..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml deleted file mode 100644 index 77b28d9023..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml deleted file mode 100644 index 8ec290a831..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml deleted file mode 100644 index 1398416978..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite deleted file mode 100644 index db1f0d34e7..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite deleted file mode 100644 index 5be79b741a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType deleted file mode 100644 index a76fae8090..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/pom.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/pom.xml deleted file mode 100644 index b96b2a2482..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-classloader-test - Apache Tuscany Contribution Classloader tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-monitor - 1.5.1 - runtime - - - - junit - junit - 4.5 - test - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java deleted file mode 100644 index 692f16f6f6..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java +++ /dev/null @@ -1,373 +0,0 @@ -/* - * 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.test.contribution; - - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.URLClassLoader; - -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.resolver.ClassReference; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -/* - * - * Contribution ClassLoading integration tests - */ - -public class ContributionTestCase { - - private SupplyChain supplyChain; - - - @Before - public void setUp() throws Exception { - supplyChain = new SupplyChain(); - } - - - @After - public void tearDown() throws Exception { - - supplyChain.tearDown(); - - } - - - /** - * Test static ClassLoading for classes that are visible from contribution - * - * @throws Exception - */ - public void staticClassLoadingTestForVisibleClasses() throws Exception { - - Contribution customerContribution = supplyChain.getContribution("Customer"); - ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer"); - customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef); - Class customerClass = customerClassRef.getJavaClass(); - - Class customerClassFromContribution = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer"); - Assert.assertEquals(customerClass, customerClassFromContribution); - - Object customer = supplyChain.getCustomer(customerClass); - - Method m = customerClass.getMethod("purchaseGoods"); - m.invoke(customer); - - - m = customerClass.getMethod("outstandingOrderCount"); - - int retries = 10; - int outstandingCount = 1; - while (retries-- > 0) { - - outstandingCount = (int)(Integer)m.invoke(customer); - if (outstandingCount == 0) - break; - else - Thread.sleep(100); - } - Assert.assertEquals(0, outstandingCount); - - - } - - - /** - * Test dynamic ClassLoading for classes that are visible from contribution - * - * @throws Exception - */ - public void dynamicClassLoadingTestForVisibleClasses() throws Exception { - - Contribution customerContribution = supplyChain.getContribution("Customer"); - Contribution retailerContribution = supplyChain.getContribution("Retailer"); - Contribution warehouseContribution = supplyChain.getContribution("Warehouse"); - Contribution shipperContribution = supplyChain.getContribution("Shipper"); - Contribution supplyChainContribution = supplyChain.getContribution("SupplyChain"); - - ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer"); - customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef); - Class customerClass = customerClassRef.getJavaClass(); - - Class customerClassFromContribution = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer"); - Assert.assertEquals(customerClass, customerClassFromContribution); - - Object customer = supplyChain.getCustomer(customerClass); - Assert.assertTrue(customerClass.isInstance(customer)); - - ClassReference retailerClassRef = new ClassReference("supplychain.retailer.Retailer"); - retailerClassRef = retailerContribution.getModelResolver().resolveModel(ClassReference.class, retailerClassRef); - Class retailerClass = retailerClassRef.getJavaClass(); - - Class retailerClassFromContribution = retailerContribution.getClassLoader().loadClass("supplychain.retailer.Retailer"); - Assert.assertEquals(retailerClass, retailerClassFromContribution); - - Class retailerClassFromCustomer = customerContribution.getClassLoader().loadClass("supplychain.retailer.Retailer"); - Assert.assertEquals(retailerClass, retailerClassFromCustomer); - - ClassReference warehouseClassRef = new ClassReference("supplychain.warehouse.Warehouse"); - warehouseClassRef = warehouseContribution.getModelResolver().resolveModel(ClassReference.class, warehouseClassRef); - Class warehouseClass = warehouseClassRef.getJavaClass(); - - Class warehouseClassFromContribution = warehouseContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse"); - Assert.assertEquals(warehouseClass, warehouseClassFromContribution); - - Class warehouseClassFromRetailer = retailerContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse"); - Assert.assertEquals(warehouseClass, warehouseClassFromRetailer); - - ClassReference shipperClassRef = new ClassReference("supplychain.shipper.Shipper"); - shipperClassRef = shipperContribution.getModelResolver().resolveModel(ClassReference.class, shipperClassRef); - Class shipperClass = shipperClassRef.getJavaClass(); - - Class shipperClassFromContribution = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper"); - Assert.assertEquals(shipperClass, shipperClassFromContribution); - - Class shipperClassFromWarehouse = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper"); - Assert.assertEquals(shipperClass, shipperClassFromWarehouse); - - Class customerClassFromShipper = shipperContribution.getClassLoader().loadClass("supplychain.customer.Customer"); - Assert.assertEquals(customerClass, customerClassFromShipper); - - Class customerClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.customer.Customer"); - Assert.assertEquals(customerClass, customerClassFromSupplyChain); - Class retailerClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.retailer.Retailer"); - Assert.assertEquals(retailerClass, retailerClassFromSupplyChain); - Class warehouseClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse"); - Assert.assertEquals(warehouseClass, warehouseClassFromSupplyChain); - Class shipperClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.shipper.Shipper"); - Assert.assertEquals(shipperClass, shipperClassFromSupplyChain); - - } - - /** - * Test dynamic ClassLoading for classes that are visible from contribution - * - * @throws Exception - */ - public void dynamicClassLoadingTestForNonImportedClasses() throws Exception { - - Contribution customerContribution = supplyChain.getContribution("Customer"); - Contribution shipperContribution = supplyChain.getContribution("Shipper"); - - Class customerClass = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer"); - Class shipperClass = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper"); - - try { - customerClass.getClassLoader().loadClass("supplychain.warehouse.Warehouse"); - Assert.fail("Non-imported class loaded incorrectly"); - } catch (ClassNotFoundException e) { - } - try { - customerClass.getClassLoader().loadClass("supplychain.shipper.JavaShipperComponentImpl"); - Assert.fail("Non-imported class loaded incorrectly"); - } catch (ClassNotFoundException e) { - } - - try { - Class.forName("supplychain.warehouse.Warehouse", true, customerClass.getClassLoader()); - Assert.fail("Non-imported class loaded incorrectly"); - } catch (ClassNotFoundException e) { - } - try { - Class.forName("supplychain.shipper.JavaShipperComponentImpl", true, customerClass.getClassLoader()); - Assert.fail("Non-imported class loaded incorrectly"); - } catch (ClassNotFoundException e) { - } - - try { - shipperClass.getClassLoader().loadClass("supplychain.warehouse.JavaWarehouseComponentImpl"); - Assert.fail("Non-imported class loaded incorrectly"); - } catch (ClassNotFoundException e) { - } - try { - shipperClass.getClassLoader().loadClass("supplychain.retailer.Retailer"); - Assert.fail("Non-imported class loaded incorrectly"); - } catch (ClassNotFoundException e) { - } - - try { - Class.forName("supplychain.warehouse.JavaWarehouseComponentImpl", true, shipperClass.getClassLoader()); - Assert.fail("Non-imported class loaded incorrectly"); - } catch (ClassNotFoundException e) { - } - try { - Class.forName("supplychain.retailer.Retailer", true, shipperClass.getClassLoader()); - Assert.fail("Non-imported class loaded incorrectly"); - } catch (ClassNotFoundException e) { - } - - - } - - - /** - * This test ensures that classes from imported packages can be statically loaded - * from other contributions even though the classes are not on CLASSPATH or on the - * parent ClassLoader, or the thread context ClassLoader. - * - * @throws Exception - */ - @Test - public void testValidStaticClassLoading() throws Exception { - - supplyChain.setUp(this.getClass().getClassLoader()); - - staticClassLoadingTestForVisibleClasses(); - } - - /** - * This test ensures that all imported classes are loaded from the exporting contributions - * rather than the parent classLoader. If any of the interface classes were incorrectly loaded - * through the parent ClassLoader, LinkageError should result. - * - * @throws Exception - */ - @Test - public void testValidStaticClassLoadingWithContributionsInParentClassLoader() throws Exception { - - - URLClassLoader parentClassLoader = new URLClassLoader( - supplyChain.getContributionURLs(), - this.getClass().getClassLoader()); - - supplyChain.setUp(parentClassLoader); - - staticClassLoadingTestForVisibleClasses(); - } - - - /** - * This test ensures that classes from imported packages can be dynamically loaded from - * other contributions even though the classes are not on CLASSPATH or on the - * parent ClassLoader, or the thread context ClassLoader. - * - * @throws Exception - */ - @Test - public void testValidDynamicClassLoading() throws Exception { - - supplyChain.setUp(this.getClass().getClassLoader()); - - dynamicClassLoadingTestForVisibleClasses(); - } - - /** - * This test ensures that all imported classes are dynamically loaded from the exporting - * contributions rather than the parent classLoader. If any of the interface classes were - * incorrectly loaded through the parent, NoClassDefFoundError or LinkageError should result. - * - * @throws Exception - */ - @Test - public void testValidDynamicClassLoadingWithContributionsInParentClassLoader() throws Exception { - - - URLClassLoader parentClassLoader = new URLClassLoader( - supplyChain.getContributionURLs(), - this.getClass().getClassLoader()); - - supplyChain.setUp(parentClassLoader); - - dynamicClassLoadingTestForVisibleClasses(); - } - - @Test - public void testIllegalStaticClassLoading1() throws Exception { - // FIXME we have commented this code as we are not throwing exceptions anymore - // need to deal with monitor logs to catch the errors. - - /*try { - supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_ILLEGAL_1); - - Assert.fail("Composite containing unresolved references resolved incorrectly"); - } catch (ContributionResolveException e) { - }*/ - } - - @Test - public void testIllegalStaticClassLoading2() throws Exception { - - supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_ILLEGAL_2); - - Contribution customerContribution = supplyChain.getContribution("Customer"); - ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer"); - customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef); - Class customerClass = customerClassRef.getJavaClass(); - - Object customer = supplyChain.getCustomer(customerClass); - - try { - Method m = customerClass.getMethod("purchaseGoods"); - m.invoke(customer); - - Assert.fail("Classloading exception not thrown as expected"); - } catch (InvocationTargetException e) { - - Throwable cause = e.getCause(); - Assert.assertTrue(cause instanceof NoClassDefFoundError); - Assert.assertTrue(cause.getMessage().indexOf("JavaWarehouseComponentImpl") > -1); } - - } - - /** - * This test ensures that classes from imported packages can be dynamically loaded from - * other contributions even though the classes are not on CLASSPATH or on the - * parent ClassLoader, or the thread context ClassLoader. - * - * @throws Exception - */ - @Test - public void testIllegalDynamicClassLoading() throws Exception { - - supplyChain.setUp(this.getClass().getClassLoader()); - - dynamicClassLoadingTestForNonImportedClasses(); - } - - - /** - * Self-contained contribution containing composites, componentType files and implementations - * should not require import/export statements for these files to find each other or for Tuscany - * to load these files. - * @throws Exception - */ - @Test - public void testSelfContainedContribution() throws Exception { - - supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_SELFCONTAINED); - - staticClassLoadingTestForVisibleClasses(); - } - - @Test - public void testContributionsWithSplitPackage() throws Exception { - - supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_SPLITPACKAGE); - - staticClassLoadingTestForVisibleClasses(); - - dynamicClassLoadingTestForNonImportedClasses(); - } -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java deleted file mode 100644 index 1ec7aaaa3a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java +++ /dev/null @@ -1,231 +0,0 @@ -/* - * 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.test.contribution; - - -import java.io.File; -import java.net.URL; -import java.util.Hashtable; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.junit.Assert; - -/* - * - * Contribution ClassLoading integration tests - */ - -public class SupplyChain { - - public static final int SUPPLYCHAIN = 0; - public static final int SUPPLYCHAIN_ILLEGAL_1 = 1; - public static final int SUPPLYCHAIN_ILLEGAL_2 = 2; - public static final int SUPPLYCHAIN_SELFCONTAINED = 3; - public static final int SUPPLYCHAIN_SPLITPACKAGE = 4; - - private String folderName = "../contribution-classes/target/classes"; - - private String customerJarName = "Customer"; - private String retailerJarName = "Retailer"; - private String warehouseJarName = "Warehouse"; - private String shipperJarName = "Shipper"; - private String supplychainJarName = "SupplyChain"; - private String illegalSupplyChain1JarName = "IllegalSupplyChain1"; - private String illegalSupplyChain2JarName = "IllegalSupplyChain2"; - private String illegalCustomerJarName = "IllegalCustomer"; - private String completeSupplychainJarName = "CompleteSupplyChain"; - private String customerInterfaceJarName = "CustomerInterface"; - private String customerImplJarName = "CustomerImpl"; - - - private EmbeddedSCADomain domain; - private ContributionService contributionService; - private int supplyChainVersion; - - private Hashtable contributions = new Hashtable(); - - private URL customerContribURL; - private URL retailerContribURL; - private URL warehouseContribURL; - private URL shipperContribURL; - private URL supplyChainContribURL; - private URL illegalSupplyChain1ContribURL; - private URL illegalSupplyChain2ContribURL; - private URL illegalCustomerContribURL; - private URL completeSupplyChainContribURL; - private URL customerInterfaceContribURL; - private URL customerImplContribURL; - - public SupplyChain() throws Exception { - - customerContribURL = new File(folderName + "/" + customerJarName + ".jar").toURI().toURL(); - retailerContribURL = new File(folderName + "/" + retailerJarName + ".jar").toURI().toURL(); - warehouseContribURL = new File(folderName + "/" + warehouseJarName + ".jar").toURI().toURL(); - shipperContribURL = new File(folderName + "/" + shipperJarName + ".jar").toURI().toURL(); - supplyChainContribURL = new File(folderName + "/" + supplychainJarName + ".jar").toURI().toURL(); - illegalSupplyChain1ContribURL = new File(folderName + "/" + illegalSupplyChain1JarName + ".jar").toURI().toURL(); - illegalSupplyChain2ContribURL = new File(folderName + "/" + illegalSupplyChain2JarName + ".jar").toURI().toURL(); - illegalCustomerContribURL = new File(folderName + "/" + illegalCustomerJarName + ".jar").toURI().toURL(); - completeSupplyChainContribURL = new File(folderName + "/" + completeSupplychainJarName + ".jar").toURI().toURL(); - customerInterfaceContribURL = new File(folderName + "/" + customerInterfaceJarName + ".jar").toURI().toURL(); - customerImplContribURL = new File(folderName + "/" + customerImplJarName + ".jar").toURI().toURL(); - } - - public void setUp(ClassLoader parentClassLoader) throws Exception { - this.setUp(parentClassLoader, SUPPLYCHAIN); - } - - public void setUp(ClassLoader parentClassLoader, int supplyChainVersion) throws Exception { - - this.supplyChainVersion = supplyChainVersion; - - Thread.currentThread().setContextClassLoader(parentClassLoader); - - //Create an embedded SCA domain - domain = new EmbeddedSCADomain(parentClassLoader, "http://localhost"); - - //Start the domain - domain.start(); - - this.contributionService = domain.getContributionService(); - - addContributions(supplyChainVersion); - } - - protected void addContributions(int supplyChainVersion) throws Exception { - - Contribution contribution; - - if (supplyChainVersion != SUPPLYCHAIN_SELFCONTAINED) { - contribution = contributionService.contribute("Shipper", shipperContribURL, true); - contributions.put("Shipper", contribution); - contribution = contributionService.contribute("Warehouse", warehouseContribURL, true); - contributions.put("Warehouse", contribution); - contribution = contributionService.contribute("Retailer", retailerContribURL, true); - contributions.put("Retailer", contribution); - } - - switch (supplyChainVersion) { - case SUPPLYCHAIN: - contribution = contributionService.contribute("Customer", customerContribURL, true); - contributions.put("Customer", contribution); - - contribution = contributionService.contribute("SupplyChain", supplyChainContribURL, true); - contributions.put("SupplyChain", contribution); - break; - case SUPPLYCHAIN_ILLEGAL_1: - contribution = contributionService.contribute("Customer", customerContribURL, true); - contributions.put("Customer", contribution); - - contribution = contributionService.contribute("SupplyChain", illegalSupplyChain1ContribURL, true); - contributions.put("SupplyChain", contribution); - break; - case SUPPLYCHAIN_ILLEGAL_2: - contribution = contributionService.contribute("Customer", illegalCustomerContribURL, true); - contributions.put("Customer", contribution); - - contribution = contributionService.contribute("SupplyChain", illegalSupplyChain2ContribURL, true); - contributions.put("SupplyChain", contribution); - break; - case SUPPLYCHAIN_SELFCONTAINED: - contribution = contributionService.contribute("SupplyChain", completeSupplyChainContribURL, true); - contributions.put("SupplyChain", contribution); - break; - case SUPPLYCHAIN_SPLITPACKAGE: - contribution = contributionService.contribute("Customer", customerInterfaceContribURL, true); - contributions.put("Customer", contribution); - - contribution = contributionService.contribute("CustomerImpl", customerImplContribURL, true); - contributions.put("CustomerImpl", contribution); - - contribution = contributionService.contribute("SupplyChain", supplyChainContribURL, true); - contributions.put("SupplyChain", contribution); - break; - } - - // SUPPLYCHAIN_ILLEGAL_1 should throw an exception when the composite is resolved, and hence - // should not get this far. - Assert.assertTrue(supplyChainVersion != SUPPLYCHAIN_ILLEGAL_1); - - - for (Contribution c : contributions.values()) { - - for (Composite deployable : c.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - } - - // Start Components from my composite - for (Composite deployable : contributions.get("SupplyChain").getDeployables() ) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - public void tearDown() throws Exception { - - if (domain == null) - return; - - for (String contributionURI : contributions.keySet()) { - contributionService.remove(contributionURI); - } - - - if (contributions.get("SupplyChain") != null) { - // Stop Components from my composite - for (Composite deployable : contributions.get("SupplyChain").getDeployables() ) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - } - - domain.stop(); - - domain.close(); - } - - public Contribution getContribution(String uri) { - if (supplyChainVersion == SUPPLYCHAIN_SELFCONTAINED) - return contributions.get("SupplyChain"); - else - return contributions.get(uri); - } - - public Object getCustomer(Class customerClass) { - return domain.getService(customerClass, "CustomerComponent"); - } - - public URL[] getContributionURLs() { - return new URL[] { - customerContribURL, - retailerContribURL, - warehouseContribURL, - shipperContribURL, - supplyChainContribURL - }; - } - - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java deleted file mode 100644 index b123951ef6..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java +++ /dev/null @@ -1,381 +0,0 @@ -/* - * 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.test.contribution; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.extensibility.ServiceDiscovery; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.osoa.sca.ServiceReference; - -/* - * - * Contribution ClassLoading integration tests - */ - -//FIXME This test case needs some serious rework! -// First it is very dependent on the names of the Tuscany runtime JARs -// and this is going to be difficult to maintain -// Second its usage of reflection requires the Tuscany implementation classes -// to be made public and this breaks isolation between modules. -public class TuscanyClassloadingTestCaseFIXME { - - // private static final int SCA_API = 1; - // private static final int TUSCANY_CORE_SPI = 2; - // private static final int TUSCANY_RUNTIME = 3; - // private static final int TUSCANY_EXTENSIONS = 4; - // private static final int TUSCANY_DEPENDENCIES = 0; - - private static final String[] scaApiJars = {"sca-api"}; - private static final String[] tuscanyCoreSpiJars = - {"core-spi", "interface", "interface-java", "interface-wsdl", "assembly", "policy", "databinding", - "contribution", "definitions"}; - private static final String[] tuscanyRuntimeJars = - { - - "binding-sca-xml", "binding-sca", "assembly-java-dsl", "assembly-xml", "assembly-xsd", "contribution-impl", - "contribution-java", "contribution-namespace", "core-databinding", "core-spring", "core", "definitions-xml", - "domain-api", "domain-impl", "domain", "extension-helper", "host-embedded", "interface-java-xml", - "interface-wsdl-xml", "java2wsdl", "node-api", "node-impl", "node", "osgi-runtime", "policy-logging", - "policy-security", "policy-transaction", "policy-xml", "wsdl2java"}; - private static final String[] tuscanyExtensionJars = - {"binding-dwr", "binding-ejb", "binding-feed", "binding-http", "binding-jms", "binding-jsonrpc", - "binding-notification", "binding-rmi", "binding-sca-axis2", "binding-ws-axis2", "binding-ws-xml", - "binding-ws", "databinding-axiom", "databinding-fastinfoset", "databinding-jaxb", "databinding-json", - "databinding-saxon", "databinding-sdo-axiom", "databinding-sdo", "databinding-xmlbeans", "host-http", - "host-jetty", "host-rmi", "host-tomcat", "host-webapp", "implementation-das.jar", "implementation-data.jar", - "implementation-java-runtime", "implementation-java-xml", "implementation-java", - "implementation-node-runtime", "implementation-node-xml", "implementation-node", - "implementation-notification", "implementation-osgi", "implementation-resource", "implementation-script", - "implementation-spring", "implementation-xquery", "contribution-osgi"}; - - private Class embeddedDomainClass; - Object domain; - - @Before - public void setUp() throws Exception { - - embeddedDomainClass = getEmbeddedDomainClass(); - - Constructor c = embeddedDomainClass.getConstructor(ClassLoader.class, String.class); - // Create an embedded domain - domain = c.newInstance(embeddedDomainClass.getClassLoader(), "http://localhost"); - - // Start the domain - invokeNoArgsMethod(domain, "start"); - - } - - @After - public void tearDown() throws Exception { - - // Stop the domain - invokeNoArgsMethod(domain, "stop"); - - } - - /** - * Create a ClassLoader hierarchy for Tuscany runtime - * Dependencies <- SCA-API <- Core-SPI+ Runtime <- Extensions - * Load the embedded SCA domain class using the runtime ClassLoader - * - * @return embedded SCA domain class - * @throws Exception - */ - private Class getEmbeddedDomainClass() throws Exception { - - URL[] scaApiUrls; - URL[] runtimeUrls; - URL[] extensionUrls; - URL[] dependencyUrls; - - // When the test is run under Eclipse, the ClassLoader for the test is - // sun.misc.Launcher$AppClassLoader. The first code path is taken. - // When the test is run under Maven, the ClassLoader for the test is - // org.apache.maven.surefire.booter.IsolatedClassLoader, which is a subclass - // of URLClassLoader. The second code path is taken. - if (!(this.getClass().getClassLoader() instanceof URLClassLoader)) { - String classPath = System.getProperty("java.class.path"); - String[] classPathEntries = classPath.split(System.getProperty("path.separator")); - HashSet dependentJars = new HashSet(); - for (int i = 0; i < classPathEntries.length; i++) { - dependentJars.add(classPathEntries[i]); - } - - scaApiUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, scaApiJars); - runtimeUrls = - getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyCoreSpiJars, tuscanyRuntimeJars); - extensionUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyExtensionJars); - dependencyUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars); - } else { - HashSet dependentJars = new HashSet(); - URL[] classPathEntries = ((URLClassLoader)this.getClass().getClassLoader()).getURLs(); - for (int i = 0; i < classPathEntries.length; i++) { - dependentJars.add(classPathEntries[i]); - } - scaApiUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, scaApiJars); - runtimeUrls = - getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyCoreSpiJars, tuscanyRuntimeJars); - extensionUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyExtensionJars); - dependencyUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars); - - } - - boolean useSingleClassLoader = - (scaApiUrls == null || scaApiUrls.length == 0) || (runtimeUrls == null || runtimeUrls.length == 0) - || (extensionUrls == null || extensionUrls.length == 0) - || (dependencyUrls == null || dependencyUrls.length == 0); - - if (useSingleClassLoader) { - return EmbeddedSCADomain.class; - } else { - - ClassLoader dependencyLoader = new URLClassLoader(dependencyUrls, null); - ClassLoader scaApiLoader = new URLClassLoader(scaApiUrls, dependencyLoader); - ClassLoader runtimeClassLoader = new URLClassLoader(runtimeUrls, scaApiLoader); - ClassLoader extensionClassLoader = new URLClassLoader(extensionUrls, runtimeClassLoader); - - Class serviceDiscoveryClass = runtimeClassLoader.loadClass(ServiceDiscovery.class.getName()); - Method getInstanceMethod = serviceDiscoveryClass.getMethod("getInstance"); - Object serviceDiscoveryObj = getInstanceMethod.invoke(null); - Method registerClassLoaderMethod = - serviceDiscoveryClass.getMethod("registerClassLoader", ClassLoader.class); - registerClassLoaderMethod.invoke(serviceDiscoveryObj, extensionClassLoader); - - Thread.currentThread().setContextClassLoader(extensionClassLoader); - - return runtimeClassLoader.loadClass(EmbeddedSCADomain.class.getName()); - - } - - } - - /** - * From the list of entries in the test ClassLoader, match - * Tuscany jars corresponding to a ClassLoader, and return the list - * of matching entries as URLs. - * This method is used when the test is run under eclipse, using CLASSPATH - * based application ClassLoader. - * - * @param classPathEntries List of entries on CLASSPATH - * @param dependentJars Complete set of jars, remove jars corresponding to this - * ClassLoader from the set. - * @param jars List of Tuscany jars corresponding to this ClassLoader - * @return Matching URLs for the ClassLoader - * @throws IOException - */ - private URL[] getTuscanyClassLoaderURLs(String[] classPathEntries, HashSet dependentJars, String[]... jars) - throws IOException { - - String pathSeparator = System.getProperty("file.separator"); - HashSet classPathEntrySet; - - if (jars.length == 0) - classPathEntrySet = dependentJars; - else { - classPathEntrySet = new HashSet(); - - for (int i = 0; i < classPathEntries.length; i++) { - - String classPathEntry = classPathEntries[i]; - for (int j = 0; j < jars.length; j++) { - String[] jarList = jars[j]; - if (jarList != null) { - for (int k = 0; k < jarList.length; k++) { - String jarName = "tuscany-" + jarList[k]; - String alternateJarName = "modules" + pathSeparator + jarList[k]; - if (classPathEntry.indexOf(jarName) >= 0 || classPathEntry.indexOf(alternateJarName) >= 0) { - classPathEntrySet.add(classPathEntry); - dependentJars.remove(classPathEntry); - } - } - } - } - } - - } - ArrayList urls = new ArrayList(); - - for (String fileName : classPathEntrySet) { - File file = new File((String)fileName); - if (!file.exists()) { - throw new FileNotFoundException(fileName); - - } else { - urls.add(file.toURL()); - - } - } - - return (URL[])urls.toArray(new URL[urls.size()]); - } - - /** - * From the list of URLs of the test ClassLoader, match - * Tuscany jars corresponding to a ClassLoader, and return the matching URLs - * This method is used when the test is run under Maven. The test ClassLoader is - * org.apache.maven.surefire.booter.IsolatedClassLoader, which is a subclass - * of URLClassLoader - * - * @param classPathEntries List of URLs from the test ClassLoader - * @param dependentJars Complete set of jars, remove jars corresponding to this - * ClassLoader from the set. - * @param jars List of Tuscany jars corresponding to this ClassLoader - * @return Matching URLs for the ClassLoader - * @throws IOException - */ - private URL[] getTuscanyClassLoaderURLs(URL[] classPathEntries, HashSet dependentJars, String[]... jars) - throws IOException { - - String pathSeparator = System.getProperty("file.separator"); - HashSet classPathEntrySet; - - if (jars.length == 0) - classPathEntrySet = dependentJars; - else { - classPathEntrySet = new HashSet(); - - for (int i = 0; i < classPathEntries.length; i++) { - - URL classPathEntry = classPathEntries[i]; - String classPathEntryStr = classPathEntry.getPath(); - for (int j = 0; j < jars.length; j++) { - String[] jarList = jars[j]; - if (jarList != null) { - for (int k = 0; k < jarList.length; k++) { - String jarName = "tuscany-" + jarList[k]; - String alternateJarName = "modules" + pathSeparator + jarList[k]; - if (classPathEntryStr.indexOf(jarName) >= 0 || classPathEntryStr.indexOf(alternateJarName) >= 0) { - classPathEntrySet.add(classPathEntry); - dependentJars.remove(classPathEntry); - } - } - } - } - } - - } - return (URL[])classPathEntrySet.toArray(new URL[classPathEntrySet.size()]); - } - - private Object invokeNoArgsMethod(Object obj, String methodName) throws Exception { - - return obj.getClass().getMethod(methodName).invoke(obj); - } - - private Object invokeOneArgMethod(Object obj, String methodName, Class argType, Object arg) throws Exception { - - return obj.getClass().getMethod(methodName, argType).invoke(obj, arg); - } - - /** - * - * Load Tuscany runtime using multiple ClassLoaders, and run supplychain - * test. - * - * @throws Exception - */ - @SuppressWarnings("unchecked") - @Test - public void test() throws Exception { - - ClassLoader runtimeClassloader = embeddedDomainClass.getClassLoader(); - - if (runtimeClassloader == this.getClass().getClassLoader()) { - System.out.println("Runtime and test loaded using the same classloader " + runtimeClassloader); - } else { - System.out - .println("Running test using separate Tuscany classloaders, runtime classloader=" + runtimeClassloader); - ClassLoader apiClassLoader = - runtimeClassloader.loadClass(ServiceReference.class.getName()).getClassLoader(); - Assert.assertTrue(apiClassLoader != runtimeClassloader); - - try { - runtimeClassloader.loadClass("org.apache.tuscany.sca.implementation.java.JavaImplementation"); - Assert.fail("Loaded extension class incorrectly from runtimeClassLoader"); - } catch (ClassNotFoundException e) { - } - - } - - // Contribute supplychain (as single contribution) - Object contributionService = invokeNoArgsMethod(domain, "getContributionService"); - Method contributeMethod = - contributionService.getClass().getMethod("contribute", String.class, URL.class, boolean.class); - - String folderName = "../contribution-classes/target/classes"; - String supplychainJarName = "CompleteSupplyChain"; - URL supplyChainContribURL = new File(folderName + "/" + supplychainJarName + ".jar").toURL(); - Object contribution = contributeMethod.invoke(contributionService, "SupplyChain", supplyChainContribURL, true); - - Object composite = ((List)invokeNoArgsMethod(contribution, "getDeployables")).get(0); - Object domainComposite = invokeNoArgsMethod(domain, "getDomainComposite"); - List includes = (List)invokeNoArgsMethod(domainComposite, "getIncludes"); - includes.add(composite); - //Object compositeBuilder = invokeNoArgsMethod(domain, "getCompositeBuilder"); - Object compositeActivator = invokeNoArgsMethod(domain, "getCompositeActivator"); - - Class compositeClass = embeddedDomainClass.getClassLoader().loadClass(Composite.class.getName()); - invokeOneArgMethod(domain, "buildComposite", compositeClass, composite); - invokeOneArgMethod(compositeActivator, "activate", compositeClass, composite); - invokeOneArgMethod(compositeActivator, "start", compositeClass, composite); - - // Get customer service - Method getClassLoaderMethod = contribution.getClass().getMethod("getClassLoader"); - ClassLoader classLoader = (ClassLoader)getClassLoaderMethod.invoke(contribution); - - Class customerClass = classLoader.loadClass("supplychain.customer.Customer"); - Method getServiceMethod = embeddedDomainClass.getMethod("getService", Class.class, String.class); - Object customer = getServiceMethod.invoke(domain, customerClass, "CustomerComponent"); - - // Invoke purchaseGoods - Method m = customerClass.getMethod("purchaseGoods"); - m.invoke(customer); - - m = customerClass.getMethod("outstandingOrderCount"); - - int retries = 10; - int outstandingCount = 1; - while (retries-- > 0) { - - outstandingCount = (int)(Integer)m.invoke(customer); - if (outstandingCount == 0) - break; - else - Thread.sleep(100); - } - Assert.assertEquals(0, outstandingCount); - - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-classloader/pom.xml b/tags/java/sca/1.5.1/itest/contribution-classloader/pom.xml deleted file mode 100644 index 928701e060..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-classloader/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-classloader - pom - Apache Tuscany Contribution ClassLoader Integration Tests - - - contribution-classes - contribution-test - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.5.1 - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/pom.xml b/tags/java/sca/1.5.1/itest/contribution-folder/pom.xml deleted file mode 100644 index 74065fb4f5..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-folder/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-folder - Apache Tuscany SCA iTest Folder and ZIP Contribution - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java deleted file mode 100644 index 9f9c15c14d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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. - */ - - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -import calculator.CalculatorService; - - - -/** - * Test SCADomain.newInstance and invocation of a service. - * - * @version $Rev: 608205 $ $Date: 2008-01-02 20:29:05 +0000 (Wed, 02 Jan 2008) $ - */ -public class ContributionFolderTestCase extends TestCase { - - private SCADomain domain; - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("myDomain", "src/test/resources/repository2/folderWithJars", null ); - } - - public void testInvoke() throws Exception { - CalculatorService service = domain.getService(CalculatorService.class, "CalculatorServiceComponent"); - assertEquals(3.0, service.add(1, 2)); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java deleted file mode 100644 index 98bbe3935a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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. - */ - - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -import calculator.CalculatorService; - - - -/** - * Test SCADomain.newInstance and invocation of a service. - * - * @version $Rev: 608205 $ $Date: 2008-01-02 20:29:05 +0000 (Wed, 02 Jan 2008) $ - */ -public class ContributionZIPTestCase extends TestCase { - - private SCADomain domain; - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("myDomain", "src/test/resources/repository3/contribution.zip", null ); - } - - public void testInvoke() throws Exception { - CalculatorService service = domain.getService(CalculatorService.class, "CalculatorServiceComponent"); - assertEquals(3.0, service.add(1, 2)); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java deleted file mode 100644 index a318cf50d9..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 calculator; - -public interface CalculatorService { - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite deleted file mode 100644 index ac88b2ac48..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml deleted file mode 100644 index 8b60ae590c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar deleted file mode 100644 index 7e4a7132a3..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar deleted file mode 100644 index 0e16e11b0b..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository3/contribution.zip deleted file mode 100644 index b293aa4bcc..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-folder/src/test/resources/repository3/contribution.zip and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/pom.xml deleted file mode 100644 index 8d731c07d7..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-export-composite - Apache Tuscany SCA iTest Contribution Export - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - - junit - junit - 4.5 - test - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java deleted file mode 100644 index e65422136f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 hello; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the Hello service. - */ -@Remotable -public interface Hello { - - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java deleted file mode 100644 index 5369c18497..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 hello; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(Hello.class) -public class HelloImpl implements Hello { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 3c14560a56..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite deleted file mode 100644 index 636b7111d9..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java deleted file mode 100644 index 72b77564d2..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * 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.test.contribution; - -import hello.Hello; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - - @Override - protected void setUp() throws Exception { - // Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - // Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - URL helloURL = getContributionURL(Hello.class); - - // File helloContrib = new File("./target/classes/"); - // URL helloURL = helloContrib.toURL(); - Contribution consumerContribution = - contributionService.contribute("http://import-export/hello", helloURL, false); - Composite consumerComposite = consumerContribution.getDeployables().get(0); - domain.getDomainComposite().getIncludes().add(consumerComposite); - domain.buildComposite(consumerComposite); - - // Start Components from my composite - domain.getCompositeActivator().activate(consumerComposite); - domain.getCompositeActivator().start(consumerComposite); - } - - private URL getContributionURL(Class cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - public void testHello() throws IOException { - Hello hello = domain.getService(Hello.class, "HelloServiceComponent"); - assertNotNull(hello); - assertEquals(hello.getGreetings("lresende"), "Hello lresende"); - } - - @Override - public void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/pom.xml deleted file mode 100644 index 85c50da029..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-export-java - Apache Tuscany SCA iTest Contribution Java Export - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - - junit - junit - 4.5 - test - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 74d22ed830..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index dc33dfa560..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType deleted file mode 100644 index 5a14b41650..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/pom.xml deleted file mode 100644 index 8d5eb73174..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-export-resource - Apache Tuscany SCA iTest Contribution Resource Export - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index f11eacb416..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html deleted file mode 100644 index 1ff281373a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html +++ /dev/null @@ -1,27 +0,0 @@ - - - -Store - - - -

Sample Store Page

- - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/pom.xml deleted file mode 100644 index 1793d8e70a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-export-wsdl - Apache Tuscany SCA iTest Contribution WSDL Export - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index b7394ec14b..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl deleted file mode 100644 index 9b31363e1a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd deleted file mode 100644 index d3c83b08c6..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/pom.xml deleted file mode 100644 index 35c0314f65..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-import-composite - Apache Tuscany SCA iTest Contribution Import - - - - org.apache.tuscany.sca - itest-contribution-export-composite - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - - junit - junit - 4.5 - test - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 966f56d7d5..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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 helloworld; - -import hello.Hello; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - @Reference - protected Hello helloServiceRef; - - public String getGreetings(String name) { - return helloServiceRef.getGreetings(name); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java deleted file mode 100644 index 3d43290380..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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 helloworld; - -import java.io.IOException; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This server program shows how to create an SCA runtime, and start it which - * activates the helloworld Web service endpoint. - */ -public class HelloWorldServer { - - public static void main(String[] args) { - - SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite"); - - try { - System.out.println("HelloWorld server started (press enter to shutdown)"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - - scaDomain.close(); - System.out.println("HelloWorld server stopped"); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 74d22ed830..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 9f3f5be452..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl deleted file mode 100644 index 9b31363e1a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd deleted file mode 100644 index d3c83b08c6..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite deleted file mode 100644 index e2f852ff7e..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 1176a89143..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * 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.test.contribution; - -import hello.Hello; -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.Socket; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloWorldServerTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution helloWorldContribution; - private Contribution compositeContribution; - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - // File compositeContribLocation = new File("../export-composite/target/classes"); - // URL compositeContribURL = compositeContribLocation.toURL(); - URL compositeContribURL = getContributionURL(Hello.class); - compositeContribution = - contributionService.contribute("http://import-export/export-composite", compositeContribURL, false); - for (Composite deployable : compositeContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - -// File helloWorldContribLocation = new File("./target/classes/"); -// URL helloWorldContribURL = helloWorldContribLocation.toURL(); - URL helloWorldContribURL = getContributionURL(HelloWorldService.class); - helloWorldContribution = - contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - private URL getContributionURL(Class cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - - assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); - } - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/helloworld"); - contributionService.remove("http://import-export/export-composite"); - - //Stop Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/pom.xml deleted file mode 100644 index 32befa7498..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-import-java - Apache Tuscany SCA iTest Contribution Java Import - - - - org.apache.tuscany.sca - itest-contribution-export-java - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - - junit - junit - 4.5 - test - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 4cdcc1fd0b..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 helloworld; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 224e2c4d79..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite deleted file mode 100644 index 9b650e4acc..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 431988cc04..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * 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.test.contribution; - -import helloworld.HelloWorldImpl; -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloWorldServerTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution helloWorldContribution; - private Contribution javaContribution; - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - //File javaContribLocation = new File("../export-java/target/classes"); - //URL javaContribURL = javaContribLocation.toURL(); - URL javaContribURL = getContributionURL(HelloWorldService.class); - javaContribution = contributionService.contribute("http://import-export/export-java", javaContribURL, false); - for (Composite deployable : javaContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - //File helloWorldContribLocation = new File("./target/classes/"); - //URL helloWorldContribURL = helloWorldContribLocation.toURL(); - URL helloWorldContribURL = getContributionURL(HelloWorldImpl.class); - helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - private URL getContributionURL(Class cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - public void testPing() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - assertEquals("Hello test", helloWorldService.getGreetings("test")); - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - - assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); - } - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/helloworld"); - contributionService.remove("http://import-export/export-java"); - - // Stop Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/pom.xml deleted file mode 100644 index 214231ba18..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-import-resource - Apache Tuscany SCA iTest Contribution Resource Import - - - - - org.apache.tuscany.sca - itest-contribution-export-resource - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-host-http - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-binding-http-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-resource-runtime - 1.5.1 - test - - - - org.apache.tuscany.sca - tuscany-contribution-resource - 1.5.1 - test - - - - javax.servlet - servlet-api - 2.5 - provided - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - - junit - junit - 4.5 - test - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ac6d7becb3..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite deleted file mode 100644 index bb5a7b764f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java deleted file mode 100644 index 1b7542b7d9..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * 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.test.contribution; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.Socket; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class StoreTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution storeContribution; - private Contribution resourceContribution; - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - URL javaContribURL = getContributionURL(cl, "ufservices/store.html"); - resourceContribution = contributionService.contribute("http://import-export/export-resource", javaContribURL, false); - for (Composite deployable : resourceContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - URL storeContributionURL = getContributionURL(cl, "store.composite"); - - storeContribution = - contributionService.contribute("http://import-export/store", storeContributionURL, false); - for (Composite deployable : storeContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : storeContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/store"); - contributionService.remove("http://import-export/export-resource"); - - // Stop Components from my composite - for (Composite deployable : storeContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - - domain.close(); - } - - - /** - * Utility methods - */ - - - private URL getContributionURL(ClassLoader cl, Class cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cl.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - private URL getContributionURL(ClassLoader cl, String uri) throws MalformedURLException { - URL url = cl.getResource(uri); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - uri.length()); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/pom.xml deleted file mode 100644 index 9b60834e53..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-import-wsdl - Apache Tuscany SCA iTest Contribution WSDL Import - - - - org.apache.tuscany.sca - itest-contribution-export-wsdl - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - - junit - junit - 4.5 - test - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 4cdcc1fd0b..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 helloworld; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java deleted file mode 100644 index 3d43290380..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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 helloworld; - -import java.io.IOException; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This server program shows how to create an SCA runtime, and start it which - * activates the helloworld Web service endpoint. - */ -public class HelloWorldServer { - - public static void main(String[] args) { - - SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite"); - - try { - System.out.println("HelloWorld server started (press enter to shutdown)"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - - scaDomain.close(); - System.out.println("HelloWorld server stopped"); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 74d22ed830..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index d46fe0b57c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite deleted file mode 100644 index 5008a2ea5b..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 5c40606e50..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * 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.test.contribution; - -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.Socket; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloWorldServerTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution wsdlContribution; - private Contribution consumerContribution; - - @Override - protected void setUp() throws Exception { - // Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - // File wsdlContribLocation = new File("../export-wsdl/target/classes"); - // URL wsdlContribURL = wsdlContribLocation.toURL(); - URL wsdlContribURL = getContributionURL(getClass().getClassLoader(), "helloworld.wsdl"); - wsdlContribution = contributionService.contribute("http://import-export/export-wsdl", wsdlContribURL, false); - for (Composite deployable : wsdlContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // File helloWorldContribLocation = new File("./target/classes/"); - // URL helloWorldContribURL = helloWorldContribLocation.toURL(); - URL helloWorldContribURL = getContributionURL(HelloWorldService.class); - consumerContribution = - contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : consumerContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : consumerContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - private URL getContributionURL(Class cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - private URL getContributionURL(ClassLoader cl, String flag) throws MalformedURLException { - URL url = cl.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length()); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - // System.out.println(url); - return url; - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - - assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); - } - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/helloworld"); - contributionService.remove("http://import-export/export-wsdl"); - - // Stop Components from my composite - for (Composite deployable : consumerContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-import-export/pom.xml b/tags/java/sca/1.5.1/itest/contribution-import-export/pom.xml deleted file mode 100644 index 76fedfafc0..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-import-export/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-import-export - pom - Apache Tuscany SCA Contribution Import/Export Integration Tests - - - export-composite - export-java - export-resource - export-wsdl - import-composite - import-java - import-resource - import-wsdl - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.5.1 - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml deleted file mode 100644 index 123c776499..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - itest-contribution-jee-samples - 1.5.1 - ../pom.xml - - - itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp - Apache Tuscany SCA iTest Contribution Java EE Samples 30 - ear - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-00-jar-shared - 1.5.1 - provided - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit - 1.5.1 - ejb - provided - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-06-war-appcomp-contrib-implicit - 1.5.1 - war - provided - - - - - - - - org.apache.maven.plugins - maven-ear-plugin - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-00-jar-shared - true - / - - - org.apache.tuscany.sca - itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit - / - - - org.apache.tuscany.sca - itest-contribution-jee-samples-06-war-appcomp-contrib-implicit - / - - - - - - ${artifactId} - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite deleted file mode 100644 index 3b1555f567..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/src/main/application/META-INF/application.composite +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - EJB - - - - - - - - - Java - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml deleted file mode 100644 index fe71740c9c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - itest-contribution-jee-samples - 1.5.1 - ../pom.xml - - - itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit - Apache Tuscany SCA iTest Contribution Java EE Samples 29 - ear - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-00-jar-shared - 1.5.1 - provided - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-08-ejb-enhanced - 1.5.1 - ejb - provided - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-01-war-nonenhanced - 1.5.1 - war - provided - - - - - - - - org.apache.maven.plugins - maven-ear-plugin - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-00-jar-shared - true - / - - - org.apache.tuscany.sca - itest-contribution-jee-samples-08-ejb-enhanced - / - - - org.apache.tuscany.sca - itest-contribution-jee-samples-01-war-nonenhanced - / - - - - - - ${artifactId} - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite deleted file mode 100644 index b131d375b0..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - EJB - - - - - - - - - - EJB - - - - - - - - - - - - - Java - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite deleted file mode 100644 index 90872041b0..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/resources/isthisignored.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml deleted file mode 100644 index 94795ab129..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ear-nonenhanced/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - itest-contribution-jee-samples - 1.5.1 - ../pom.xml - - - itest-contribution-jee-samples-13-ear-nonenhanced - Apache Tuscany SCA iTest Contribution Java EE Samples 13 - ear - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-07-ejb-nonenhanced - 1.5.1 - ejb - provided - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-01-war-nonenhanced - 1.5.1 - war - provided - - - - - - - - org.apache.maven.plugins - maven-ear-plugin - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-07-ejb-nonenhanced - / - - - org.apache.tuscany.sca - itest-contribution-jee-samples-01-war-nonenhanced - / - - - - - - ${artifactId} - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml deleted file mode 100644 index e7f7422a7d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - itest-contribution-jee-samples - 1.5.1 - ../pom.xml - - - itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit - Apache Tuscany SCA iTest Contribution Java EE Samples 12 - ejb - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - 1.1.1 - provided - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-ejb-plugin - - 3.0 - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java deleted file mode 100644 index 0194d1870c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Remote; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remote -public interface HelloworldService { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java deleted file mode 100644 index ad9003dc67..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * 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 sample.ejb3; - -import javax.ejb.Stateless; - -import org.osoa.sca.annotations.Reference; - -/** - * HelloworldService EJB implementation with no SCA enhancement - - */ -@Stateless -public class HelloworldServiceBean implements HelloworldService { - - @Reference - protected HelloworldService nextService; - - public String getGreetings(String name) { - String greeting = "Hello " + name; - System.out.println(greeting); - return greeting; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite deleted file mode 100644 index bcaa154913..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/ejb-jar.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml deleted file mode 100644 index 9a97cbd535..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/resources/META-INF/openejb-jar.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - test - itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit - 1.0 - jar - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml deleted file mode 100644 index 10aa2d8127..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - itest-contribution-jee-samples - 1.5.1 - ../pom.xml - - - itest-contribution-jee-samples-08-ejb-enhanced - Apache Tuscany SCA iTest Contribution Java EE Samples 08 - ejb - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - 1.1.1 - provided - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-ejb-plugin - - 3.0 - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java deleted file mode 100644 index b5224a2319..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Local; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Local -public interface HelloworldLocal8 { - String getGreetingsLocal(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java deleted file mode 100644 index e5e9fe6a82..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Remote; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remote -public interface HelloworldService8 { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java deleted file mode 100644 index a6d7f2dd04..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * 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 sample.ejb3; - -import javax.ejb.Stateless; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; - -/** - * HelloworldService EJB implementation SCA enhancement - - */ -@Stateless -public class HelloworldService8Bean implements HelloworldService8, HelloworldLocal8 { - - @Reference - protected HelloworldService8 hwReference; - - @Property - protected String hwProperty; - - public String getGreetings(String name) { - String greeting = "Hello remote " + name; - System.out.println(greeting); - return greeting; - } - - public String getGreetingsLocal(String name) { - String greeting = "Hello local " + name; - System.out.println(greeting); - return greeting; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml deleted file mode 100644 index db36c4b140..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - test - itest-contribution-jee-samples-08-ejb-enhanced - 1.0 - jar - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite deleted file mode 100644 index 90872041b0..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/isthisignored.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml deleted file mode 100644 index 506652388d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - itest-contribution-jee-samples - 1.5.1 - ../pom.xml - - - itest-contribution-jee-samples-07-ejb-nonenhanced - Apache Tuscany SCA iTest Contribution Java EE Samples 07 - ejb - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - 1.1.1 - provided - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-ejb-plugin - - 3.0 - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java deleted file mode 100644 index 4df5cd37de..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldLocal7.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Local; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Local -public interface HelloworldLocal7 { - String getGreetingsLocal(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java deleted file mode 100644 index 41ecddb62e..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Remote; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remote -public interface HelloworldService7 { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java deleted file mode 100644 index 403ead623c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7Bean.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * 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 sample.ejb3; - -import javax.ejb.Stateless; - -/** - * HelloworldService EJB implementation with no SCA enhancement - - */ -@Stateless -public class HelloworldService7Bean implements HelloworldService7, HelloworldLocal7 { - - public String getGreetings(String name) { - String greeting = "Hello remote " + name; - System.out.println(greeting); - return greeting; - } - - public String getGreetingsLocal(String name) { - String greeting = "Hello local " + name; - System.out.println(greeting); - return greeting; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java deleted file mode 100644 index 97242bff96..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService7aBean.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * 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 sample.ejb3; - -import javax.ejb.Stateless; - -/** - * Another HelloworldService EJB implementation with no SCA enhancement - * A test for TUSCANY-3198 - */ -@Stateless -public class HelloworldService7aBean implements HelloworldService7, HelloworldLocal7 { - - public String getGreetings(String name) { - String greeting = "Hello remote " + name; - System.out.println(greeting); - return greeting; - } - - public String getGreetingsLocal(String name) { - String greeting = "Hello local " + name; - System.out.println(greeting); - return greeting; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml deleted file mode 100644 index 7428735903..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - test - itest-contribution-jee-samples-7-ejb-nonenhanced - 1.0 - jar - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/pom.xml deleted file mode 100644 index 0e7836ceb1..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - itest-contribution-jee-samples - 1.5.1 - ../pom.xml - - - itest-contribution-jee-samples-00-jar-shared - Apache Tuscany SCA iTest Contribution Java EE Samples 00 - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - 1.1.1 - provided - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - sample.java.JarMain - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java deleted file mode 100644 index 5a08769550..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJava.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.java; - -import org.osoa.sca.annotations.Remotable; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remotable -public interface HelloworldServiceJava { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java deleted file mode 100644 index 265af5b3a0..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/HelloworldServiceJavaImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * 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 sample.java; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; - -public class HelloworldServiceJavaImpl implements HelloworldServiceJava { - - @Reference - protected HelloworldServiceJava hwReference; - - @Property - protected String hwProperty; - - public String getGreetings(String name) { - String greeting = hwReference.getGreetings(name) + " " + hwProperty; - System.out.println(greeting); - return greeting; - } -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java deleted file mode 100644 index 81793e47e6..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/jar-shared/src/main/java/sample/java/JarMain.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * 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 sample.java; - -public class JarMain { - - public static void main(String[] args) { - System.out.println("JarMain called"); - } -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/pom.xml deleted file mode 100644 index 6ab28e497d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - 4.0.0 - - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - - itest-contribution-jee-samples - Apache Tuscany SCA iTest Contribution Java EE Samples - - pom - - - - default - - true - - - jar-shared - war-nonenhanced - war-appcomp-contrib-implicit - ejb-nonenhanced - ejb-enhanced - ejb-appcomp-contrib-implicit - ear-nonenhanced - ear-appcomp-contrib-implicit - ear-appcomp-contrib-implicit-war-appcomp - scajar-ear-nonenhanced - scajar-ear-appcomp - scajar-ear-appcomp-war-appcomp - scazip-ejb-appcomp - scazip-war-appcomp - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml deleted file mode 100644 index 302a758784..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 1.5.1 - ../../pom.xml - - itest-contribution-jee-samples-43-scajar-ear-appcomp-war-appcomp - Apache Tuscany SCA iTest Contribution Java EE Samples 43 - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java deleted file mode 100644 index 0194d1870c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Remote; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remote -public interface HelloworldService { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java deleted file mode 100644 index 1fad282a75..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/java/HelloworldServiceJava.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 sample.java; - -import org.osoa.sca.annotations.Remotable; - - -@Remotable -public interface HelloworldServiceJava { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java deleted file mode 100644 index 8adb6a5995..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 sample.pojo; - -public interface HelloworldClient2 { - - String getGreetings(String name); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java deleted file mode 100644 index ae16263505..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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 sample.pojo; - -import org.osoa.sca.annotations.Reference; - -import sample.ejb3.HelloworldService; -import sample.java.HelloworldServiceJava; - -public class HelloworldClient2Impl implements HelloworldClient2 { - - @Reference - protected HelloworldService hwService; - - @Reference - protected HelloworldServiceJava hwJavaService; - - public String getGreetings(String name){ - //return hwService.getGreetings(name) + hwJavaService.getGreetings(name); - return hwJavaService.getGreetings(name); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java deleted file mode 100644 index 05885cead7..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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 sample.pojo; - -import sample.java.HelloworldServiceJava; - -public class HelloworldTargetImpl implements HelloworldServiceJava { - - public String getGreetings(String name){ - return "Hello " + name; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite deleted file mode 100644 index e9346fb2bb..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp-war-appcomp/src/main/resources/helloworld.composite +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml deleted file mode 100644 index 718a745068..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 1.5.1 - ../../pom.xml - - itest-contribution-jee-samples-41-scajar-ear-appcomp - Apache Tuscany SCA iTest Contribution Java EE Samples 41 - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java deleted file mode 100644 index 0194d1870c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Remote; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remote -public interface HelloworldService { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java deleted file mode 100644 index 1fad282a75..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 sample.java; - -import org.osoa.sca.annotations.Remotable; - - -@Remotable -public interface HelloworldServiceJava { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java deleted file mode 100644 index 8adb6a5995..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 sample.pojo; - -public interface HelloworldClient2 { - - String getGreetings(String name); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java deleted file mode 100644 index ae16263505..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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 sample.pojo; - -import org.osoa.sca.annotations.Reference; - -import sample.ejb3.HelloworldService; -import sample.java.HelloworldServiceJava; - -public class HelloworldClient2Impl implements HelloworldClient2 { - - @Reference - protected HelloworldService hwService; - - @Reference - protected HelloworldServiceJava hwJavaService; - - public String getGreetings(String name){ - //return hwService.getGreetings(name) + hwJavaService.getGreetings(name); - return hwJavaService.getGreetings(name); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java deleted file mode 100644 index 05885cead7..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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 sample.pojo; - -import sample.java.HelloworldServiceJava; - -public class HelloworldTargetImpl implements HelloworldServiceJava { - - public String getGreetings(String name){ - return "Hello " + name; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite deleted file mode 100644 index ebd8377725..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml deleted file mode 100644 index c29d0c58ce..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 1.5.1 - ../../pom.xml - - itest-contribution-jee-samples-35-scajar-ear-nonenhanced - Apache Tuscany SCA iTest Contribution Java EE Samples 35 - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java deleted file mode 100644 index 0194d1870c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Remote; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remote -public interface HelloworldService { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java deleted file mode 100644 index 6f37c9b272..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 sample.pojo; - -public interface HelloworldClient { - - String getGreetings(String name); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java deleted file mode 100644 index a38c4a773f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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 sample.pojo; - -import org.osoa.sca.annotations.Reference; - -import sample.ejb3.HelloworldService; - -public class HelloworldClientImpl implements HelloworldClient { - - @Reference - protected HelloworldService hwService; - - public String getGreetings(String name){ - return hwService.getGreetings(name); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite deleted file mode 100644 index 79c9dd3243..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml deleted file mode 100644 index bdbe79a46d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/build.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml deleted file mode 100644 index 67241cc12e..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/pom.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 1.5.1 - ../../pom.xml - - itest-contribution-jee-samples-10-scazip-ejb-appcomp - Apache Tuscany SCA iTest Contribution Java EE Samples 10 - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit - 1.5.1 - ejb - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-dependency-plugin - - - generate-sources - - copy - - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit - ${project.version} - true - ${project.build.directory}/classes - - - true - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-jar-to-zip - verify - - run - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java deleted file mode 100644 index 0194d1870c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/ejb3/HelloworldService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Remote; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remote -public interface HelloworldService { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java deleted file mode 100644 index 6f37c9b272..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClient.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 sample.pojo; - -public interface HelloworldClient { - - String getGreetings(String name); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java deleted file mode 100644 index a38c4a773f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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 sample.pojo; - -import org.osoa.sca.annotations.Reference; - -import sample.ejb3.HelloworldService; - -public class HelloworldClientImpl implements HelloworldClient { - - @Reference - protected HelloworldService hwService; - - public String getGreetings(String name){ - return hwService.getGreetings(name); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite deleted file mode 100644 index 909b8a1484..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-ejb-appcomp/src/main/resources/helloworld.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml deleted file mode 100644 index bdbe79a46d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/build.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml deleted file mode 100644 index f88d68876d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 1.5.1 - ../../pom.xml - - itest-contribution-jee-samples-04-scazip-war-appcomp - Apache Tuscany SCA iTest Contribution Java EE Samples 04 - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-06-war-appcomp-contrib-implicit - 1.5.1 - war - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - - org.apache.maven.plugins - maven-dependency-plugin - - - generate-sources - - copy - - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-06-war-appcomp-contrib-implicit - ${project.version} - war - true - ${project.build.directory}/classes - - - true - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - ant - ant-trax - 1.6.5 - - - - - - copy-jar-to-zip - verify - - run - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java deleted file mode 100644 index 0194d1870c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/ejb3/HelloworldService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Remote; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remote -public interface HelloworldService { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java deleted file mode 100644 index 6f37c9b272..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClient.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 sample.pojo; - -public interface HelloworldClient { - - String getGreetings(String name); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java deleted file mode 100644 index a38c4a773f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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 sample.pojo; - -import org.osoa.sca.annotations.Reference; - -import sample.ejb3.HelloworldService; - -public class HelloworldClientImpl implements HelloworldClient { - - @Reference - protected HelloworldService hwService; - - public String getGreetings(String name){ - return hwService.getGreetings(name); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite deleted file mode 100644 index eaa567595e..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/scazip-war-appcomp/src/main/resources/helloworld.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml deleted file mode 100644 index f5295b7388..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - itest-contribution-jee-samples - 1.5.1 - ../pom.xml - - - itest-contribution-jee-samples-06-war-appcomp-contrib-implicit - Apache Tuscany SCA iTest Contribution Java EE Samples 06 - war - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - javax.servlet - servlet-api - 2.5 - provided - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - - - - - org.apache.maven.plugins - maven-war-plugin - - - ${artifactId} - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java deleted file mode 100644 index ae8613f8db..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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 sample; - -import java.io.IOException; -import java.io.Writer; - -import javax.ejb.EJB; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.osoa.sca.annotations.Reference; - -import sample.ejb3.HelloworldService; - -/** - * A servlet that invokes HelloworldService which is an SCA enhanced stateless EJB. - * - * @version $Rev$ $Date$ - */ -public class HelloworldEjbServlet extends HttpServlet { - private static final long serialVersionUID = -4448818871934180718L; - - @EJB - private HelloworldService service; - - @Reference - protected HelloworldService helloworldSca; - - @Override - protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException { - String name = request.getParameter("name"); - String greeting = service.getGreetings(name); - String greeting2 = helloworldSca.getGreetings(name.toUpperCase()); - - Writer out = response.getWriter(); - out.write("Apache Tuscany Helloworld Web Sample"); - out.write("

Apache Tuscany Helloworld Web Sample

"); - out.write("This page displays the response got from HelloworldServiceBean, which is a Stateless EJB."); - out.write("
Parameter sent to HelloworldService.getGreeting: "+name); - out.write(greeting); - out.write("The following is got by invoking the HelloworldService SCA service provided by the HelloworldServiceBean"); - out.write("
Parameter sent to HelloworldService.getGreeting: "+name.toUpperCase()); - out.write(greeting2); - out.write(""); - out.flush(); - out.close(); - } -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java deleted file mode 100644 index 0194d1870c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Remote; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remote -public interface HelloworldService { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml deleted file mode 100644 index 2563c8b7c8..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - test - helloworld-web - 1.0 - car - - - - test - helloworld-ejb - 1.0 - jar - - - - - - helloworld-web - - ejb/HelloworldServiceBean - - test - helloworld-ejb - 1.0 - HelloworldServiceBean - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 823085e81f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 628588a974..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - Helloworld Web Sample - - - HelloworldEjbServlet - sample.HelloworldEjbServlet - - - - HelloworldEjbServlet - /HelloworldEjbServlet - - - - hello.html - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html deleted file mode 100644 index 69473543c9..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - -Apache Tuscany Helloworld Web Sample - - - - -

Apache Tuscany Helloworld Web Sample

- -This web page posts the data to HelloworldEjbServlet. The servlet invokes HelloworldServiceBean, which is a Stateless EJB. -The EJB in turn invokes Helloworld SCA service through proxies injected into EJB fields. - -

- -
- - - - - - - - -
Enter your name: - -
- -
-
- - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml deleted file mode 100644 index aa14813a14..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - itest-contribution-jee-samples - 1.5.1 - ../pom.xml - - - itest-contribution-jee-samples-01-war-nonenhanced - Apache Tuscany SCA iTest Contribution Java EE Samples 01 - war - - - - org.apache.tuscany.sca - tuscany-sca-api - 1.5.1 - provided - - - - javax.servlet - servlet-api - 2.5 - provided - - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - provided - - - - - - - org.apache.maven.plugins - maven-war-plugin - - - ${artifactId} - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java deleted file mode 100644 index 71055bbdfe..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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 sample; - -import java.io.IOException; -import java.io.Writer; - -import javax.ejb.EJB; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.osoa.sca.annotations.Reference; - -import sample.ejb3.HelloworldService; - -/** - * A servlet that invokes HelloworldService which is an SCA enhanced stateless EJB. - * - * @version $Rev$ $Date$ - */ -public class HelloworldEjbServlet extends HttpServlet { - private static final long serialVersionUID = -4448818871934180718L; - - @EJB - private HelloworldService service; - - @Override - protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException { - String name = request.getParameter("name"); - String greeting = service.getGreetings(name); - //String greeting2 = helloworldSca.getGreetings(name.toUpperCase()); - - Writer out = response.getWriter(); - out.write("Apache Tuscany Helloworld Web Sample"); - out.write("

Apache Tuscany Helloworld Web Sample

"); - out.write("This page displays the response got from HelloworldServiceBean, which is a Stateless EJB."); - out.write("
Parameter sent to HelloworldService.getGreeting: "+name); - out.write(greeting); - out.write("The following is got by invoking the HelloworldService SCA service provided by the HelloworldServiceBean"); - out.write("
Parameter sent to HelloworldService.getGreeting: "+name.toUpperCase()); - //out.write(greeting2); - out.write(""); - out.flush(); - out.close(); - } -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java deleted file mode 100644 index 0194d1870c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 sample.ejb3; - -import javax.ejb.Remote; - -/** - * HelloworldService EJB interface. - * - * @version $Rev$ $Date$ - */ - -@Remote -public interface HelloworldService { - String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml deleted file mode 100644 index 2563c8b7c8..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - test - helloworld-web - 1.0 - car - - - - test - helloworld-ejb - 1.0 - jar - - - - - - helloworld-web - - ejb/HelloworldServiceBean - - test - helloworld-ejb - 1.0 - HelloworldServiceBean - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 628588a974..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - Helloworld Web Sample - - - HelloworldEjbServlet - sample.HelloworldEjbServlet - - - - HelloworldEjbServlet - /HelloworldEjbServlet - - - - hello.html - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html b/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html deleted file mode 100644 index 69473543c9..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - -Apache Tuscany Helloworld Web Sample - - - - -

Apache Tuscany Helloworld Web Sample

- -This web page posts the data to HelloworldEjbServlet. The servlet invokes HelloworldServiceBean, which is a Stateless EJB. -The EJB in turn invokes Helloworld SCA service through proxies injected into EJB fields. - -

- -
- - - - - - - - -
Enter your name: - -
- -
-
- - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/pom.xml b/tags/java/sca/1.5.1/itest/contribution-jee/pom.xml deleted file mode 100644 index 7f245e2da5..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/pom.xml +++ /dev/null @@ -1,183 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-jee - Apache Tuscany SCA iTest Contribution Java EE - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-contribution - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-contribution-jee-impl - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-host-webapp - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-ejb - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-jee - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-web-runtime - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - - - - org.apache.myfaces.core - myfaces-api - 1.2.3 - - - - org.apache.myfaces.core - myfaces-impl - 1.2.3 - - - - org.apache.geronimo.specs - geronimo-jsp_2.1_spec - 1.0.1 - - - - org.apache.geronimo.specs - geronimo-el_1.0_spec - 1.0.1 - - - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-01-war-nonenhanced - 1.5.1 - war - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-06-war-appcomp-contrib-implicit - 1.5.1 - war - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-07-ejb-nonenhanced - 1.5.1 - ejb - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-08-ejb-enhanced - 1.5.1 - ejb - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit - 1.5.1 - ejb - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-13-ear-nonenhanced - 1.5.1 - ear - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit - 1.5.1 - ear - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-35-scajar-ear-nonenhanced - 1.5.1 - jar - - - - org.apache.tuscany.sca - itest-contribution-jee-samples-41-scajar-ear-appcomp - 1.5.1 - jar - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java deleted file mode 100644 index e7e1d90797..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProvider.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.test.contribution.jee; - -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; - - -class TestEJBImplementationProvider implements ImplementationProvider { - - TestEJBImplementationProvider(RuntimeComponent component, EJBImplementation ejbImplementation) { - } - - public Invoker createInvoker(RuntimeComponentService service, Operation operation) { - return null; - } - - public boolean supportsOneWayInvocation() { - return false; - } - - public void start() { - } - - public void stop() { - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java deleted file mode 100644 index 4660fee7fd..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestEJBImplementationProviderFactory.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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.test.contribution.jee; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.provider.ImplementationProvider; -import org.apache.tuscany.sca.provider.ImplementationProviderFactory; -import org.apache.tuscany.sca.runtime.RuntimeComponent; - -/** - * A factory for resource implementation providers. - * - * @version $Rev$ $Date$ - */ -public class TestEJBImplementationProviderFactory implements ImplementationProviderFactory { - - /** - * Constructs a resource implementation. - */ - public TestEJBImplementationProviderFactory(ExtensionPointRegistry extensionPoints) { - } - - public ImplementationProvider createImplementationProvider(RuntimeComponent component, EJBImplementation implementation) { - return new TestEJBImplementationProvider(component, implementation); - } - - public Class getModelType() { - return EJBImplementation.class; - } -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java deleted file mode 100644 index 34bf3702d3..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * 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.test.contribution.jee; - -import java.io.File; -import java.net.URI; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -public class TestExternalEarModelResolver implements ModelResolver { - - private Map map = new HashMap(); - private JavaEEIntrospector jeeIntrospector; - private ContributionService contributionService; - - - public TestExternalEarModelResolver(Contribution contribution, ExtensionPointRegistry extensionPoints) { - jeeIntrospector = extensionPoints.getExtensionPoint(JavaEEIntrospector.class); - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - contributionService = utilities.getUtility(ContributionService.class); - - } - - public void addModel(Object resolved) { - ExternalEarInfo jeeApp = (ExternalEarInfo)resolved; - map.put(jeeApp.getAppInfo().getUri(), jeeApp); - } - - public Object removeModel(Object resolved) { - return map.remove(((ExternalEarInfo)resolved).getAppInfo().getUri()); - } - - public T resolveModel(final Class modelClass, T unresolved) { - URI uri = ((ExternalEarInfo)unresolved).getAppInfo().getUri(); - if (uri != null) { - ExternalEarInfo resolved = (ExternalEarInfo) map.get(uri); - if (resolved != null) { - return modelClass.cast(resolved); - } else { - // if you don't care about application composites you can - // simply read the EAR directly - /* - try { - File f = new File(uri.toString()); - final JavaEEApplicationInfo o = jeeIntrospector.introspectJeeArchive(f.toURI().toURL()); - return (T)new ExternalEarInfo() { - public JavaEEApplicationInfo getAppInfo() { - return (JavaEEApplicationInfo)o; - } - }; - } catch (Exception e) { - throw new RuntimeException(e); - } - */ - - // if you do care about the application composite you - // need to process the ear as a contribution - try{ - // find the location of the ear using a very specific algorithm - URL earLocation = null; - if ( uri.toString().equals("itest-contribution-jee-samples-13-ear-nonenhanced.ear")){ - earLocation = new File("../contribution-jee-samples/ear-nonenhanced/target/itest-contribution-jee-samples-13-ear-nonenhanced.ear").toURL(); - } else if ( uri.toString().equals("itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear")){ - earLocation = new File("../contribution-jee-samples/ear-appcomp-contrib-implicit/target/itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear").toURL(); - } else if ( uri.toString().equals("itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear")){ - earLocation = new File("../contribution-jee-samples/ear-appcomp-contrib-implicit-war-appcomp/target/itest-contribution-jee-samples-30-ear-appcomp-contrib-implicit-war-appcomp.ear").toURL(); - } else { - return unresolved; - } - - // if you do care about application composites we have - // to process the EAR as a contribution - Contribution contribution = contributionService.contribute(uri.toString(), earLocation, false); - - JavaEEApplicationInfo appInfo = null; - Composite appComposite = null; - - // get the ear info - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof JavaEEApplicationInfo){ - appInfo = (JavaEEApplicationInfo)artifact.getModel(); - } - - if (artifact.getURI().equals("META-INF/application.composite")){ - appComposite = (Composite)artifact.getModel(); - } - } - - - final JavaEEApplicationInfo returnAppInfo = appInfo; - final Composite returnAppComposite = appComposite; - - return (T)new ExternalEarInfo() { - public JavaEEApplicationInfo getAppInfo() { - return returnAppInfo; - } - public Composite getAppComposite() { - return returnAppComposite; - } - }; - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - - return unresolved; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver deleted file mode 100644 index a39171507c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -org.apache.tuscany.sca.test.contribution.jee.TestExternalEarModelResolver;model=org.apache.tuscany.sca.contribution.jee.ExternalEarInfo diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory deleted file mode 100644 index adc93d9015..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory +++ /dev/null @@ -1,19 +0,0 @@ -# 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. - -# Implementation class for the implementation extension -org.apache.tuscany.sca.test.contribution.jee.TestEJBImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.ejb.EJBImplementation diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java deleted file mode 100644 index b81f67c287..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java +++ /dev/null @@ -1,329 +0,0 @@ -/* - * 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.test.contribution.jee; - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * This is an integration test for Java EE contribution processing. * - * - * @version $Rev$ $Date$ - */ - -public class ContributionServiceTestCase { - private static final String CONTRIBUTION_001_ID = "contribution001/"; - private static final String CONTRIBUTION_002_ID = "contribution002/"; - private static final String JAR_CONTRIBUTION = "/repository/helloworld-service.jar"; - private static final String EJB_JAR_CONTRIBUTION = "/repository/helloworld-ejb.jar"; - private static final String EJB_JAR_W_DEPLOYABLE_CONTRIBUTION = "/repository/helloworld-ejb-w-dep.jar"; - private static final String WAR_CONTRIBUTION = "/repository/helloworld-web.war"; - private static final String WAR_W_DEPLOYABLE_CONTRIBUTION = "/repository/helloworld-web-w-dep.war"; - private static final String EAR_CONTRIBUTION = "/repository/helloworld-ejb.ear"; - private static final String EAR_NONENHANCED_CONTRIBUTION = "/repository/simple-app-ear.jar"; - private static final String EAR_ENHANCED_16_CONTRIBUTION = "/repository/simple-app.ear"; - private static final String EAR_ENHANCED_19_CONTRIBUTION = "/repository/enhanced-app.ear"; - - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - /** - * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending - * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and - * to get a reference to the contribution service - */ - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * This method tests a non Java EE contribution. - */ - @Test - public void testContributeJAR() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - } - - /** - * This method tests an EJB jar as a contribution. - */ - @Test - public void testContributeEJBJAR() throws Exception { - URL contributionLocation = getClass().getResource(EJB_JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - - Contribution contribution = contributionService.getContribution(contributionId); - List artifacts = contribution.getArtifacts(); - for(Artifact artifact : artifacts) { - if(artifact.getURI().toString().equals("META-INF/ejb-jar.composite")) { - Composite composite = (Composite)artifact.getModel(); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation); - EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation(); - Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); - Service service = ejbImpl.getServices().get(0); - Assert.assertEquals("Service name", "HelloworldService", service.getName()); - } - } - } - - /** - * This method tests an EJB jar with sca-contribution.xml as a contribution. - */ - @Test - public void testContributeEJBJARwDeployable() throws Exception { - URL contributionLocation = getClass().getResource(EJB_JAR_W_DEPLOYABLE_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - - Contribution contribution = contributionService.getContribution(contributionId); - List artifacts = contribution.getArtifacts(); - for(Artifact artifact : artifacts) { - if(artifact.getURI().toString().equals("META-INF/ejb-jar.composite")) { - Composite composite = (Composite)artifact.getModel(); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation); - EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation(); - Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); - Service service = ejbImpl.getServices().get(0); - Assert.assertEquals("Service name", "HelloworldService", service.getName()); - } - } - - List deployables = contribution.getDeployables(); - Assert.assertEquals("Deployable composites", 1, deployables.size()); - Composite composite = deployables.get(0); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.ejb", component.getImplementation() instanceof EJBImplementation); - EJBImplementation ejbImpl = (EJBImplementation) component.getImplementation(); - Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); - Service service = ejbImpl.getServices().get(0); - Assert.assertEquals("Service name", "HelloworldService", service.getName()); - } - - /** - * This method tests WAR as a contribution. - */ - @Test - public void testContributeWAR() throws Exception { - URL contributionLocation = getClass().getResource(WAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - - Contribution contribution = contributionService.getContribution(contributionId); - List artifacts = contribution.getArtifacts(); - for(Artifact artifact : artifacts) { - if(artifact.getURI().toString().equals("WEB-INF/web.composite")) { - Composite composite = (Composite)artifact.getModel(); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation); - WebImplementation webImpl = (WebImplementation) component.getImplementation(); - Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size()); - List referenceNames = new ArrayList(); - referenceNames.add("name1"); - referenceNames.add("sample.HelloworldEjbServlet_service"); - for(Reference ref : webImpl.getReferences()) { - Assert.assertTrue(referenceNames.contains(ref.getName())); - } - } - } - } - - /** - * This method tests WAR with sca-contribution.xml as a contribution. - */ - @Test - public void testContributeWARwDeployable() throws Exception { - URL contributionLocation = getClass().getResource(WAR_W_DEPLOYABLE_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - - Contribution contribution = contributionService.getContribution(contributionId); - List artifacts = contribution.getArtifacts(); - for(Artifact artifact : artifacts) { - if(artifact.getURI().toString().equals("WEB-INF/web.composite")) { - Composite composite = (Composite)artifact.getModel(); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation); - WebImplementation webImpl = (WebImplementation) component.getImplementation(); - Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size()); - List referenceNames = new ArrayList(); - referenceNames.add("name1"); - referenceNames.add("sample.HelloworldEjbServlet_service"); - for(Reference ref : webImpl.getReferences()) { - Assert.assertTrue(referenceNames.contains(ref.getName())); - } - } - } - - List deployables = contribution.getDeployables(); - Assert.assertEquals("Deployable composites", 1, deployables.size()); - Composite composite = deployables.get(0); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.web", component.getImplementation() instanceof WebImplementation); - WebImplementation webImpl = (WebImplementation) component.getImplementation(); - Assert.assertEquals("Number of reference", 2, webImpl.getReferences().size()); - List referenceNames = new ArrayList(); - referenceNames.add("name1"); - referenceNames.add("sample.HelloworldEjbServlet_service"); - for(Reference ref : webImpl.getReferences()) { - Assert.assertTrue(referenceNames.contains(ref.getName())); - } - } - - /** - * This method test EAR as a contribution. - */ - @Test - public void testContributeEAR() throws Exception { - URL contributionLocation = getClass().getResource(EAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(contributionId)); - } - - /** - * This method tests a JAR containing an EAR as a contribution. - * non-enhanced EAR containing non-enhanced WAR, non-enhanced EJB JAR. - */ - @Ignore - @Test - public void testContributeEAR_NonEnhanced() throws Exception { - URL contributionLocation = getClass().getResource(EAR_NONENHANCED_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Contribution contribution = contributionService.getContribution(contributionId); - Assert.assertNotNull(contribution); - List deployables = contribution.getDeployables(); - Assert.assertEquals("Deployable composites", 1, deployables.size()); - Composite composite = deployables.get(0); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.jee", component.getImplementation() instanceof JEEImplementation); - JEEImplementation jeeImpl = (JEEImplementation)component.getImplementation(); - Assert.assertEquals("Number of services", 2, jeeImpl.getServices().size()); - Assert.assertEquals("Number of references", 1, jeeImpl.getReferences().size()); - } - - /** - * This method tests an EAR as a contribution. - * Enhanced EAR containing non-enhanced WAR, non-enhanced EJB JAR. - */ - @Test - public void testContributeEAR_Enhanced16() throws Exception { - URL contributionLocation = getClass().getResource(EAR_ENHANCED_16_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Contribution contribution = contributionService.getContribution(contributionId); - Assert.assertNotNull(contribution); - List deployables = contribution.getDeployables(); - Assert.assertEquals("Deployable composites", 1, deployables.size()); - Composite composite = deployables.get(0); - Assert.assertEquals("Number of components", 1, composite.getComponents().size()); - Component component = composite.getComponents().get(0); - Assert.assertTrue("Component with implementation.jee", component.getImplementation() instanceof JEEImplementation); - JEEImplementation jeeImpl = (JEEImplementation)component.getImplementation(); - Assert.assertEquals("Number of services", 2, jeeImpl.getServices().size()); - // TODO - TUSCANY-3008 - // Assert.assertEquals("Number of references", 1, jeeImpl.getReferences().size()); - } - - /** - * This method tests an EAR as a contribution. - * Enhanced EAR w application composite containing non-enhanced WAR, non-enhanced EJB JAR. - */ - @Test - public void testContributeEAR_Enhanced19() throws Exception { - URL contributionLocation = getClass().getResource(EAR_ENHANCED_19_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - Contribution contribution = contributionService.getContribution(contributionId); - Assert.assertNotNull(contribution); - - List artifacts = contribution.getArtifacts(); - for(Artifact artifact : artifacts) { - if(artifact.getURI().toString().equals("META-INF/application.composite")) { - Composite composite = (Composite)artifact.getModel(); - Assert.assertEquals("Number of components", 3, composite.getComponents().size()); - for(Component component : composite.getComponents()) { - if(component.getName().equals("webComponent")) { - Assert.assertTrue(component.getImplementation() instanceof WebImplementation); - WebImplementation webImpl = (WebImplementation)component.getImplementation(); - Assert.assertEquals("Number of references", 1, webImpl.getReferences().size()); - } else if(component.getName().equals("ejbComponent1")) { - Assert.assertTrue(component.getImplementation() instanceof EJBImplementation); - EJBImplementation ejbImpl = (EJBImplementation)component.getImplementation(); - Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); - Assert.assertEquals("Number of references", 0, ejbImpl.getReferences().size()); - } else if(component.getName().equals("ejbComponent2")) { - Assert.assertTrue(component.getImplementation() instanceof EJBImplementation); - EJBImplementation ejbImpl = (EJBImplementation)component.getImplementation(); - Assert.assertEquals("Number of services", 1, ejbImpl.getServices().size()); - Assert.assertEquals("Number of references", 1, ejbImpl.getReferences().size()); - } - } - } - } - } -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java deleted file mode 100644 index 4241b7928f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/EjbAppcompTestCase.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * 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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class EjbAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * EJB - It's an JEE EAR file that is a contribution - * appcomp - It has an application composite in it - * - */ - @Test - public void testEjbAppcom() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/ejb-appcomp-contrib-implicit/target/itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit.jar").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - Assert.assertEquals(1, composite.getComponents().size()); - Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getServices().size()); - Assert.assertEquals("HelloworldService", composite.getComponents().get(0).getImplementation().getServices().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java deleted file mode 100644 index 64c31b4393..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * 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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import sample.pojo.HelloworldClient2; - - -public class SCAJarEarAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * SCAJAR - It's an SCA contribution in a JAR with no nested archives - * but which references a... - * EAR - It's an JEE EAR file - * appcomp - It has an application composite in it - * - */ - @Test - public void testSCAJarEarAppcomp() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-appcomp/target/itest-contribution-jee-samples-41-scajar-ear-appcomp.jar").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - domain.getDomainComposite().getIncludes().add(composite); - - Assert.assertEquals(3, composite.getComponents().size()); - Assert.assertEquals(3, composite.getComponents().get(1).getImplementation().getServices().size()); - Assert.assertEquals("TheService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - domain.getCompositeActivator().activate(composite); - domain.getCompositeActivator().start(composite); - - HelloworldClient2 client = domain.getService(HelloworldClient2.class, "HelloworldClientComponent"); - Assert.assertEquals("Hello Fred Java", client.getGreetings("Fred")); - - domain.stop(); - - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java deleted file mode 100644 index 9f50ea573c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompWarAppcompTestCase.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * 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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import sample.pojo.HelloworldClient2; - - -public class SCAJarEarAppcompWarAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * SCAJAR - It's an SCA contribution in a JAR with no nested archives - * but which references a... - * EAR - It's an JEE EAR file - * appcomp - It has an application composite in it - * WAR - It has a WAR (and and EAR) in it - * appcomp - It has an application composite in it which should be ignored - */ - @Test - public void testSCAJarEarAppcomp() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-appcomp-war-appcomp/target/itest-contribution-jee-samples-43-scajar-ear-appcomp-war-appcomp.jar").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - domain.getDomainComposite().getIncludes().add(composite); - - Assert.assertEquals(3, composite.getComponents().size()); - Assert.assertEquals(2, composite.getComponents().get(1).getImplementation().getServices().size()); - Assert.assertEquals("TheService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - domain.getCompositeActivator().activate(composite); - domain.getCompositeActivator().start(composite); - - HelloworldClient2 client = domain.getService(HelloworldClient2.class, "HelloworldClientComponent"); - Assert.assertEquals("Hello Fred Java", client.getGreetings("Fred")); - - domain.stop(); - - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java deleted file mode 100644 index 97e23d1bf7..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * 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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class SCAJarEarNonenhancedTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - private static final String CONTRIBUTION_002_ID = "contribution002/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - /** - * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending - * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and - * to get a reference to the contribution service - */ - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * SCAJAR - It's an SCA contribution in a JAR with no nested archives - * but which references a... - * EAR - It's an JEE EAR file - * nonenhanced - It has no SCA enhancements. Just a normal EAR - * - */ - @Test - public void testSCAJarEarNonenhanced() throws Exception{ - /* some thoughts about how to preprocess the ear - * as an alternative to relying on the model resolver - * to do contribution processing. - - // Get some things from the extension registry that help us create the - // link between the contribution and the ear that it references - ExtensionPointRegistry registry = domain.getExtensionPointRegistry(); - ModelResolverExtensionPoint modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class); - Class externalEarModelResolver = modelResolvers.getResolver(ExternalEarInfo.class); - - // locate the ear - URL earLocation = new File("../contribution-jee-samples/ear-nonenhanced/target/itest-contribution-jee-samples-13-ear-nonenhanced.ear").toURL(); - contributionService.contribute(CONTRIBUTION_001_ID, earLocation, false); - - // find the app info - for (Artifact artifact : contributionService.getContribution(CONTRIBUTION_001_ID).getArtifacts()){ - if (artifact.getModel() instanceof JavaEEApplicationInfo){ - // need to make this model available to the external ear model - // resolver. But how? - } - } - */ - - URL contributionLocation = new File("../contribution-jee-samples/scajar-ear-nonenhanced/target/itest-contribution-jee-samples-35-scajar-ear-nonenhanced.jar").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_002_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - Assert.assertEquals(2, composite.getComponents().size()); - Assert.assertEquals(4, composite.getComponents().get(1).getImplementation().getServices().size()); - Assert.assertEquals("HelloworldService7Bean_HelloworldService7", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java deleted file mode 100644 index db4d9e5bf6..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * 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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class SCAZipEjbAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * SCAZIP - It's an SCA contribution in a ZIP with no nested archive - * but with a reference to an EJB Jar - * JAR - * appcomp - It has an application composite in it - * - */ - @Test - public void testSCAZipEjbAppcomp() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/scazip-ejb-appcomp/target/itest-contribution-jee-samples-10-scazip-ejb-appcomp.zip").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - Assert.assertEquals(2, composite.getComponents().size()); - Assert.assertEquals(1, composite.getComponents().get(1).getImplementation().getServices().size()); - Assert.assertEquals("HelloworldServiceBean_HelloworldService", composite.getComponents().get(1).getImplementation().getServices().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java deleted file mode 100644 index 211f51c9bd..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * 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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class SCAZipWarAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * SCAJAR - It's an SCA contribution in a JAR with no nested archives - * but which references a... - * EAR - It's an JEE EAR file - * appcomp - It has an application composite in it - * - */ - // not picking up references correctly - @Ignore - @Test - public void testSCAJarEarNonenhanced() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/scazip-war-appcomp/target/itest-contribution-jee-samples-04-scazip-war-appcomp.zip").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - Assert.assertEquals(1, composite.getComponents().size()); - Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getReferences().size()); - Assert.assertEquals("????", composite.getComponents().get(0).getImplementation().getReferences().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java deleted file mode 100644 index 7696b64f9c..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * 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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class WARAppcompContribImplicitTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - /** - * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending - * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and - * to get a reference to the contribution service - */ - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * WAR - It's a WAR - * Appcomp - It has an application composite - * Contrib - It's a contribution in it's own right - * Implicit - Composite deployment is implicit - * - */ - @Test - public void testWARAppcompContribImplicit() throws Exception { - URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-06-war-appcomp-contrib-implicit.war").toURL(); - contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - Assert.assertNotNull(contributionService.getContribution(CONTRIBUTION_001_ID)); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java deleted file mode 100644 index f54a4f98df..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * 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.test.contribution.jee; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.jee.ExternalEarInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEApplicationInfo; -import org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector; -import org.apache.tuscany.sca.contribution.jee.impl.JavaEEApplicationInfoImpl; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; -import org.apache.tuscany.sca.implementation.ejb.EJBImplementation; -import org.apache.tuscany.sca.implementation.jee.JEEImplementation; -import org.apache.tuscany.sca.implementation.web.WebImplementation; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - - -public class WarAppcompTestCase { - - private static final String CONTRIBUTION_001_ID = "contribution001/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - @Before - public void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * EJB - It's an JEE EAR file that is a contribution - * appcomp - It has an application composite in it - * - */ - @Test - public void testEjbAppcom() throws Exception { - - URL contributionLocation = new File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-06-war-appcomp-contrib-implicit.war").toURL(); - Contribution contribution = contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation, false); - - Assert.assertNotNull(contribution); - - Composite composite = null; - for (Artifact artifact : contribution.getArtifacts()){ - if (artifact.getModel() instanceof Composite){ - composite = (Composite) artifact.getModel(); - } - } - - Assert.assertNotNull(composite); - - Assert.assertEquals(1, composite.getComponents().size()); - Assert.assertEquals(1, composite.getComponents().get(0).getImplementation().getReferences().size()); - Assert.assertEquals("helloworldSca", composite.getComponents().get(0).getImplementation().getReferences().get(0).getName()); - - domain.buildComposite(composite); - - // assert that the build process has worked - Assert.assertNotNull(composite); - - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear deleted file mode 100644 index 11d2a029ec..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar deleted file mode 100644 index a5b160c875..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear deleted file mode 100644 index 9fb1ed9d14..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar deleted file mode 100644 index 3a704137ed..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar deleted file mode 100644 index 228f4d27d7..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war deleted file mode 100644 index 0b75db2745..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war deleted file mode 100644 index 938ea75941..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/helloworld-web.war and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar deleted file mode 100644 index 24f55a5f63..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app.ear b/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app.ear deleted file mode 100644 index c912e64237..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution-jee/src/test/resources/repository/simple-app.ear and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/pom.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/pom.xml deleted file mode 100644 index 2dd332dcc2..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution-multiple - Apache Tuscany SCA iTest Multiple Contribution - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/Hello.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/Hello.java deleted file mode 100644 index 7e574a7db3..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/Hello.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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 hello; - -/** - * This is the business interface of the Hello service. - */ -public interface Hello { - - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java deleted file mode 100644 index ff9f6e75f3..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 hello; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(Hello.class) -public class HelloImpl implements Hello { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index c062afaed0..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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 helloworld; - -import hello.Hello; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - @Reference - protected Hello helloServiceRef; - - public String getGreetings(String name) { - return helloServiceRef.getGreetings(name); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java deleted file mode 100644 index 5251fc0a45..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 helloworld; - - -/** - * This is the business interface of the HelloWorld greetings service. - */ -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java deleted file mode 100644 index ec5123eb2d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * 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 test; - -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.URL; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -import junit.framework.TestCase; - -/** - * Test multiple contributions scenario - * - * FIXME This test case causes a StackOverflowException instead of - * reporting an error when a composite is not found, as there's a - * dependency cycle in the test contributions and the model resolvers - * do not handle import cycles properly. - * - */ -public class ContributionCycleTestCaseFIXME extends TestCase { - - private String helloContribution_dir = "target/test-classes/contribution-cycle-export"; - private String helloWorldContribution_one_dir = "target/test-classes/contribution-cycle-import"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution helloContribution; - private Contribution helloWorldContribution_one; - - protected void setUp() throws Exception { - URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL(); - URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL(); - - // Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - // Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - helloContribution = - contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false); - - for (Composite deployable : helloContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - for (Composite deployable : helloContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - - helloWorldContribution_one = - contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false); - for (Composite deployable : helloWorldContribution_one.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - for (Composite deployable : helloWorldContribution_one.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService_one = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService"); - assertNotNull(helloWorldService_one); - - assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith")); - - } - - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://contribution-multiple/helloworld"); - contributionService.remove("http://contribution-multiple/helloworld_one"); - - // Stop Components from my composite - for (Composite deployable : helloWorldContribution_one.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - for (Composite deployable : helloContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - // domain.stop(); - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java deleted file mode 100644 index 133c98f357..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * 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 test; - -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.URL; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -import junit.framework.TestCase; - -/** - * Test multiple contribution scenario - * Contributed by TUSCANY-1718 - */ -public class ContributionMultipleTestCaseFIXME extends TestCase { - - private String helloContribution_dir = "target/test-classes/contribution-export"; - private String helloWorldContribution_one_dir = "target/test-classes/contribution-import-one"; - private String helloWorldContribution_two_dir = "target/test-classes/contribution-import-two"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution helloContribution; - private Contribution helloWorldContribution_one; - private Contribution helloWorldContribution_two; - - protected void setUp() throws Exception { - URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL(); - URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL(); - URL helloWorldContribution_two_URL = new java.io.File(helloWorldContribution_two_dir).toURI().toURL(); - - // Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - // Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - helloContribution = - contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false); - - helloWorldContribution_one = - contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false); - - helloWorldContribution_two = - contributionService.contribute("http://contribution-multiple/helloworld_two", helloWorldContribution_two_URL, false); - - for (Composite deployable : helloContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - } - - for (Composite deployable : helloWorldContribution_one.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - } - - for (Composite deployable : helloWorldContribution_two.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - } - - domain.buildComposite(domain.getDomainComposite()); - domain.getCompositeActivator().activate(domain.getDomainComposite()); - domain.getCompositeActivator().start(domain.getDomainComposite()); - - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService_one = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService"); - assertNotNull(helloWorldService_one); - - assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith")); - - HelloWorldService helloWorldService_two = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_two/HelloWorldService"); - assertNotNull(helloWorldService_two); - - assertEquals("Hello Smith", helloWorldService_two.getGreetings("Smith")); - - } - - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://contribution-multiple/helloworld"); - contributionService.remove("http://contribution-multiple/helloworld_one"); - contributionService.remove("http://contribution-multiple/helloworld_two"); - - // Stop Components from my composite - for (Composite deployable : helloWorldContribution_two.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - for (Composite deployable : helloWorldContribution_one.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - for (Composite deployable : helloContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - // domain.stop(); - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java deleted file mode 100644 index 790b6fed98..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * 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 test; - -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.URL; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -import junit.framework.TestCase; - -/** - * Test multiple contribution scenario - * Contributed by TUSCANY-1756 - */ -public class ContributionTestCase extends TestCase { - - private String helloContribution_dir = "target/test-classes/contribution-export"; - //private String helloWorldContribution_one_dir = "target/test-classes/contribution-import-one"; - private String helloWorldContribution_two_dir = "target/test-classes/contribution-import-two"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution helloContribution; - //private Contribution helloWorldContribution_one; - private Contribution helloWorldContribution_two; - - protected void setUp() throws Exception { - URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL(); - //URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL(); - URL helloWorldContribution_two_URL = new java.io.File(helloWorldContribution_two_dir).toURI().toURL(); - - // Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - // Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - helloContribution = - contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false); - - //helloWorldContribution_one = - // contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false); - - helloWorldContribution_two = - contributionService.contribute("http://contribution-multiple/helloworld_two", helloWorldContribution_two_URL, false); - - for (Composite deployable : helloContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - //for (Composite deployable : helloWorldContribution_one.getDeployables()) { - // domain.getDomainComposite().getIncludes().add(deployable); - // domain.buildComposite(deployable); - //} - - for (Composite deployable : helloWorldContribution_two.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - for (Composite deployable : helloContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - - //for (Composite deployable : helloWorldContribution_one.getDeployables()) { - // domain.getCompositeActivator().activate(deployable); - // domain.getCompositeActivator().start(deployable); - //} - - for (Composite deployable : helloWorldContribution_two.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - - } - - public void testServiceCall() throws IOException { - //HelloWorldService helloWorldService_one = - //domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService"); - //assertNotNull(helloWorldService_one); - - //assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith")); - - HelloWorldService helloWorldService_two = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_two/HelloWorldService"); - assertNotNull(helloWorldService_two); - - assertEquals("Hello Smith", helloWorldService_two.getGreetings("Smith")); - - } - - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://contribution-multiple/helloworld"); - //contributionService.remove("http://contribution-multiple/helloworld_one"); - contributionService.remove("http://contribution-multiple/helloworld_two"); - - // Stop Components from my composite - for (Composite deployable : helloWorldContribution_two.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - //for (Composite deployable : helloWorldContribution_one.getDeployables()) { - // domain.getCompositeActivator().stop(deployable); - // domain.getCompositeActivator().deactivate(deployable); - //} - for (Composite deployable : helloContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - // domain.stop(); - domain.close(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml deleted file mode 100644 index 8b76783c3d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite deleted file mode 100644 index aeeab337fa..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml deleted file mode 100644 index bfbf74373a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite deleted file mode 100644 index 7a8003577e..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml deleted file mode 100644 index bea6f39932..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite deleted file mode 100644 index aeeab337fa..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml deleted file mode 100644 index bfbf74373a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite deleted file mode 100644 index 45cb504ea4..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml deleted file mode 100644 index cbabdcd4fc..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite deleted file mode 100644 index 4c9225de34..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution/pom.xml b/tags/java/sca/1.5.1/itest/contribution/pom.xml deleted file mode 100644 index e41db401dc..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-contribution - Apache Tuscany SCA iTest Contribution - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.5.1 - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddService.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index 4e72f92fda..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 calculator; - -/** - * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this - * interface. Implementation for these methods is provided in AddServiceImpl Class - */ -public interface AddService { - - /** - * This is an add method which takes 2 parameters of double type and returns the sum of two parameters - */ - double add(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index e9c635e3c8..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - return n1 + n2; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 719ad69eef..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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 calculator; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - - SCADomain domain = SCADomain.newInstance("calculator/Calculator.composite"); - - CalculatorService calculatorService = domain.getService(CalculatorService.class, - "CalculatorServiceComponent"); - - // Calculate - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - domain.close(); - - } - -} \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index f288af0174..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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 calculator; - -/** - * This is a Calculator service interface. All the methods which are to be accessed as a service are declared in this - * interface but not the implementation of those methods. - */ -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index ae4ed12b7b..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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 calculator; - -import org.osoa.sca.annotations.Reference; - - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - @Reference - public void setAddService(AddService addService) { - this.addService = addService; - } - - @Reference - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - @Reference - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - @Reference - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - public double add(double n1, double n2) { - return addService.add(n1, n2); - } - - public double subtract(double n1, double n2) { - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return divideService.divide(n1, n2); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideService.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index ad99418f5b..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 calculator; - -/** - * This is an interface for Divide Service which has divide method declared which is implemented in DivideServiceImpl - * class - */ -public interface DivideService { - - /** - * This is a divide method which takes 2 parameters of double type and returns the result of division - */ - double divide(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 8c33862f6d..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 calculator; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - return n1 / n2; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 3987b0a54f..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 calculator; - -/** - * This is an interface for Multiply Service which has multiply method declared which is implemented in - * MultiplyServiceImpl class - */ -public interface MultiplyService { - - /** - * This is a multiply method which takes 2 parameters of double type and returns the result of multiplication of the - * two parameters - */ - double multiply(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c7fbc73c00..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 calculator; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - return n1 * n2; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 25e0ed6ca7..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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 calculator; - -/** - * This is an interface for Subtract Service which has subtract method declared which is implemented in - * SubtractServiceImpl class - */ - -public interface SubtractService { - - /** - * This is a subtract method which takes 2 parameters of double type and returns the result of subtraction. - */ - double subtract(double n1, double n2); - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 1a7f145ad8..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 calculator; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - return n1 - n2; - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/resources/ContributionTest.composite b/tags/java/sca/1.5.1/itest/contribution/src/main/resources/ContributionTest.composite deleted file mode 100644 index d814e439e2..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/resources/ContributionTest.composite +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/Calculator.composite b/tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/Calculator.composite deleted file mode 100644 index 657a2f95d8..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/Calculator.composite +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml deleted file mode 100644 index e95796d83a..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/tags/java/sca/1.5.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java deleted file mode 100644 index 97b2e5d6ed..0000000000 --- a/tags/java/sca/1.5.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java +++ /dev/null @@ -1,218 +0,0 @@ -/* - * 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.test.contribution; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; -import java.util.List; - -import javax.xml.namespace.QName; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.contribution.service.util.FileHelper; -import org.apache.tuscany.sca.contribution.service.util.IOHelper; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * This is more intended to be a integration test then a unit test. * - */ -public class ContributionServiceTestCase extends TestCase { - private static final String CONTRIBUTION_001_ID = "contribution001/"; - private static final String CONTRIBUTION_002_ID = "contribution002/"; - private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar"; - private static final String FOLDER_CONTRIBUTION = "target/classes/"; - - private ClassLoader cl; - private EmbeddedSCADomain domain; - private ContributionService contributionService; - - /** - * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending - * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and - * to get a reference to the contribution service - */ - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - //get a reference to the contribution service - contributionService = domain.getContributionService(); - } - - /** - * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This - * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime. - */ - public void testContributeJAR() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - //URL contributionLocation = new URL("file:/D:/dev/Opensource/Apache/Tuscany/source/java/sca/samples/calculator/target/sample-calculator.jar"); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, false); - assertNotNull(contributionService.getContribution(contributionId)); - } - - /** - * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This - * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime using - * contributionService. - */ - public void testStoreContributionPackageInRepository() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId, contributionLocation, true); - - assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation())) - .exists()); - - assertNotNull(contributionId); - - Contribution contributionModel = contributionService.getContribution(contributionId); - - File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation())); - assertTrue(contributionFile.exists()); - } - - /** - * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This - * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime using - * contributionService. - */ - public void testStoreContributionStreamInRepository() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - - InputStream contributionStream = contributionLocation.openStream(); - try { - contributionService.contribute(contributionId, contributionLocation, contributionStream); - } finally { - IOHelper.closeQuietly(contributionStream); - } - - assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation())) - .exists()); - - assertNotNull(contributionId); - - Contribution contributionModel = contributionService.getContribution(contributionId); - - File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation())); - assertTrue(contributionFile.exists()); - } - - /** - * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This - * test verifies the string assigned to contributionId1,contributionId2 with the value retrieved from the SCA - * runtime using contributionService. - */ - public void testStoreDuplicatedContributionInRepository() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId1 = CONTRIBUTION_001_ID; - contributionService.contribute(contributionId1, contributionLocation, true); - assertNotNull(contributionService.getContribution(contributionId1)); - String contributionId2 = CONTRIBUTION_002_ID; - contributionService.contribute(contributionId2, contributionLocation, true); - assertNotNull(contributionService.getContribution(contributionId2)); - } - - /** - * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This - * test verifies the string assigned to contributionId with the value retrieved from the SCA runtime using - * contributionService. - */ - public void testContributeFolder() throws Exception { - final File rootContributionFolder = new File(FOLDER_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - //first rename the sca-contribution metadata file - //File calculatorMetadataFile = new File("target/classes/calculator/sca-contribution.xml"); - //File metadataDirectory = new File("target/classes/META-INF/"); - //if (!metadataDirectory.exists()) { - // FileHelper.forceMkdir(metadataDirectory); - //} - //FileHelper.copyFileToDirectory(calculatorMetadataFile, metadataDirectory); - - // Requires permission to read user.dir property. Requires PropertyPermision in security policy. - URL contributionFolderURL; - try { - contributionFolderURL = AccessController.doPrivileged(new PrivilegedExceptionAction() { - public URL run() throws IOException { - return rootContributionFolder.toURL(); - } - }); - } catch (PrivilegedActionException e) { - throw (IOException)e.getException(); - } - contributionService.contribute(contributionId, contributionFolderURL, false); - assertNotNull(contributionService.getContribution(contributionId)); - } - - /** - * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This - * test verifies the string assigned to contributionId, artifactId with the value retrieved from the SCA runtime - * using contributionService. - */ - public void testAddDeploymentComposites() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - Contribution contribution = contributionService.contribute(contributionId, contributionLocation, false); - assertNotNull(contributionService.getContribution(contributionId)); - - String artifactId = "contributionComposite.composite"; - Composite composite = (new DefaultAssemblyFactory()).createComposite(); - composite.setName(new QName(null, "contributionComposite")); - composite.setURI("contributionComposite.composite"); - - contributionService.addDeploymentComposite(contribution, composite); - - List deployables = contributionService.getContribution(contributionId).getDeployables(); - Composite composite1 = (Composite)deployables.get(deployables.size() - 1); - assertEquals("contributionComposite", composite1.getName().toString()); - - Artifact artifact = null; - contribution = contributionService.getContribution(contributionId); - String id = artifactId.toString(); - for (Artifact a : contribution.getArtifacts()) { - if (id.equals(a.getURI())) { - artifact = a; - break; - } - } - Composite composite2 = (Composite)artifact.getModel(); - assertEquals("contributionComposite", composite2.getName().toString()); - } - -} diff --git a/tags/java/sca/1.5.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/tags/java/sca/1.5.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar deleted file mode 100644 index 0ca3a1b781..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/contribution/src/test/resources/repository/sample-calculator.jar b/tags/java/sca/1.5.1/itest/contribution/src/test/resources/repository/sample-calculator.jar deleted file mode 100644 index 0ca3a1b781..0000000000 Binary files a/tags/java/sca/1.5.1/itest/contribution/src/test/resources/repository/sample-calculator.jar and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/pom.xml b/tags/java/sca/1.5.1/itest/conversations-ws/pom.xml deleted file mode 100644 index 3e79902b89..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-conversations-ws - Apache Tuscany SCA iTest Conversations Over Web Services Binding - - - - - - org.apache.tuscany.sca - tuscany-node-impl - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java deleted file mode 100644 index 9cd88620e3..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.conversational; - -public class BusinessException extends Exception { - - private String message; - - public BusinessException() { - super(); - } - - public BusinessException(String message) { - super(message); - setMessage(message); - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java deleted file mode 100644 index 53dadc3dc7..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Conversational; - -@Conversational -public interface ConversationIdService { - - String getCIDField(); - String getCIDSetter(); -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java deleted file mode 100644 index cb7a032e85..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - - -/** - * The callback interface used when testing conversational callbacks - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Remotable -@Conversational -public interface ConversationalCallback { - - // public void init(); - - // public void destroy(); - - public void initializeCount(int count); - - public void incrementCount(); - - public int retrieveCount(); - - public void businessException() throws BusinessException; - - @EndsConversation - public String endConversation(); - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java deleted file mode 100644 index 2532346349..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Remotable; - -/** - * The client for the conversational itest. Is implemented by clients - * offering both stateless and stateful callbacks - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Remotable -public interface ConversationalClient { - - public int runConversationFromInjectedReference(); - public int runConversationFromInjectedReference2(); - public int runConversationFromServiceReference(); - public int runConversationWithUserDefinedConversationId(); - public String runConversationCheckUserDefinedConversationId(); - public int runConversationCheckingScope(); - public int runConversationWithCallback(); - public int runConversationHavingPassedReference(); - public String runConversationBusinessException(); - public String runConversationBusinessExceptionCallback(); - public int runConversationCallingEndedConversation(); - public int runConversationCallingEndedConversationCallback(); - public String runConversationCallingEndedConversationCheckConversationId(); - public String runConversationCallingEndedConversationCallbackCheckConversationId(); - public int runConversationAgeTimeout(); - public int runConversationIdleTimeout(); - public int runConversationPrincipleError(); -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java deleted file mode 100644 index 8f008fa711..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -/** - * The client that calls into an existing conversation by accepting - * a reference to that conversation - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Remotable -public interface ConversationalReferenceClient { - - public void incrementCount(CallableReference conversationalService); - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java deleted file mode 100644 index 1e36ce6917..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - - -/** - * The service interface used when testing conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Remotable -@Conversational -@Callback(ConversationalCallback.class) -public interface ConversationalService { - - public void initializeCount(int count); - - public void incrementCount(); - - public int retrieveCount(); - - //public void businessException() throws BusinessException; - - public void initializeCountCallback(int count); - - public void incrementCountCallback(); - - public int retrieveCountCallback(); - - //public void businessExceptionCallback() throws BusinessException; - - @EndsConversation - public String endConversation(); - - public String endConversationCallback(); - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java deleted file mode 100644 index b4d3fe3d71..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - - -/** - * The service interface used when testing conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Remotable -@Conversational -@Callback(NonConversationalCallback.class) -public interface ConversationalServiceNonConversationalCallback { - - - public void initializeCount(int count); - - public void incrementCount(); - - public int retrieveCount(); - - public void businessException() throws BusinessException; - - public void initializeCountCallback(int count); - - public void incrementCountCallback(); - - public int retrieveCountCallback(); - - public void businessExceptionCallback() throws BusinessException; - - @EndsConversation - public String endConversation(); - - public String endConversationCallback(); - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java deleted file mode 100644 index ed3a01c10b..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Remotable; - - -/** - * The callback interface used when testing conversational callbacks - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Remotable -public interface NonConversationalCallback { - - public void initializeCount(int count); - - public void incrementCount(); - - public int retrieveCount(); - - public void businessException() throws BusinessException; - - public String endConversation(); - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java deleted file mode 100644 index 1603916cca..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.BusinessException; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(ConversationalService.class) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="1 seconds") -public class ConversationAgeComponentImpl implements ConversationalService { - - private int count; - - public void businessException() throws BusinessException { - } - - public void businessExceptionCallback() throws BusinessException { - } - - public void destroy() { - } - - public String endConversation() { - return null; - } - - public String endConversationCallback() { - return null; - } - - public void incrementCount() { - } - - public void incrementCountCallback() { - } - - public void init() { - } - - public void initializeCount(int count) { - this.count = count; - } - - public void initializeCountCallback(int count) { - } - - public int retrieveCount() { - return count; - } - - public int retrieveCountCallback() { - return 0; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java deleted file mode 100644 index accc1eee27..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationIdService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(ConversationIdService.class) -@Scope("CONVERSATION") -public class ConversationIdComponentImpl implements ConversationIdService { - - @ConversationID - public String cid; - - private String setterCid; - - public String getCIDField() { - return cid; - } - public String getCIDSetter() { - return setterCid; - } - - - @ConversationID - public void setCID(String cid) { - this.setterCid = cid; - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java deleted file mode 100644 index 90f6de86ac..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.BusinessException; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(ConversationalService.class) -@Scope("CONVERSATION") -@ConversationAttributes(maxIdleTime="1 seconds") -public class ConversationMaxIdleComponentImpl implements ConversationalService { - - private int count; - - public void businessException() throws BusinessException { - } - - public void businessExceptionCallback() throws BusinessException { - } - - public void destroy() { - } - - public String endConversation() { - return null; - } - - public String endConversationCallback() { - return null; - } - - public void incrementCount() { - } - - public void incrementCountCallback() { - } - - public void init() { - } - - public void initializeCount(int count) { - this.count = count; - } - - public void initializeCountCallback(int count) { - } - - public int retrieveCount() { - return count; - } - - public int retrieveCountCallback() { - return 0; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java deleted file mode 100644 index 3f7a90b3dc..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java +++ /dev/null @@ -1,322 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.BusinessException; -import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.ConversationalClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * The client for the conversational itest which presents a stateful - * callback interface - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Service(interfaces={ConversationalClient.class}) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback { - - @Context - protected ComponentContext componentContext; - - @Reference - protected ConversationalService conversationalService; - - @Reference - protected ConversationalService conversationalService2; - - @Reference - protected ConversationalReferenceClient conversationalReferenceClient; - - private int clientCount = 0; - private int callbackCount = 0; - - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - // From ConversationalClient - public int runConversationFromInjectedReference(){ - calls.append("runConversationFromInjectedReference,"); - conversationalService.initializeCount(1); - conversationalService.incrementCount(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromInjectedReference2(){ - calls.append("runConversationFromInjectedReference2,"); - - conversationalService2.initializeCount(1); - conversationalService2.incrementCount(); - - // stick in a call to the first reference to - // make sure the two references don't clash - conversationalService.initializeCount(1); - - clientCount = conversationalService2.retrieveCount(); - conversationalService2.endConversation(); - - // end the conversation through the first reference - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromServiceReference(){ - calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ - calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation1"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ - calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation2"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - - String clientConversationId = serviceReference.getConversationID().toString(); - String serverConversationId = callableReference.endConversation(); - - if (clientConversationId.equals("MyConversation2") && - serverConversationId.equals("MyConversation2") ) { - return clientConversationId; - } else { - return "client = " + clientConversationId + - "server = " + serverConversationId; - } - - } - public int runConversationCheckingScope(){ - calls.append("runConversationCheckingScope,"); - // run a conversation - return runConversationFromInjectedReference(); - - // test will then use a static method to find out how many times - // init/destroy were called - } - public int runConversationWithCallback(){ - calls.append("runConversationWithCallback,"); - callbackCount = 2; - conversationalService.initializeCountCallback(1); - conversationalService.incrementCountCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - - return clientCount; - } - public int runConversationHavingPassedReference(){ - calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - conversationalReferenceClient.incrementCount(serviceReference); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); - try { - conversationalService.initializeCount(1); -// conversationalService.businessException(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public String runConversationBusinessExceptionCallback(){ - calls.append("runConversationbusinessExceptionCallback,"); - try { - conversationalService.initializeCountCallback(1); -// conversationalService.businessExceptionCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public int runConversationCallingEndedConversation(){ - calls.append("runConversationCallingEndedConversation,"); - conversationalService.initializeCount(1); - conversationalService.endConversation(); - return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ - calls.append("runConversationCallingEndedConversationCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.endConversationCallback(); - return conversationalService.retrieveCountCallback(); - } - - public String runConversationCallingEndedConversationCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public String runConversationCallingEndedConversationCallbackCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversationCallback(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public int runConversationAgeTimeout(){ - calls.append("runConversationAgeTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationIdleTimeout(){ - calls.append("runConversationIdleTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationPrincipleError(){ - calls.append("runConversationPrincipleError,"); - // TODO - when policy framework is done - return clientCount; - } - - - // From ConversationalCallback - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - callbackCount += count; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - callbackCount++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return callbackCount; - } - - public void businessException() throws BusinessException { - throw new BusinessException("Business Exception"); - } - - public String endConversation(){ - calls.append("endConversation,"); - callbackCount = 0; - return null; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java deleted file mode 100644 index ab91498132..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.BusinessException; -import org.apache.tuscany.sca.itest.conversational.ConversationalClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * The client for the conversational itest which presents a stateful - * callback interface - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Service(interfaces={ConversationalClient.class}) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback { - - @Context - protected ComponentContext componentContext; - - @Reference - protected ConversationalService conversationalService; - - @Reference - protected ConversationalService conversationalService2; - - @Reference - protected ConversationalReferenceClient conversationalReferenceClient; - - private int clientCount = 0; - private int callbackCount = 0; - - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - // From ConversationalClient - public int runConversationFromInjectedReference(){ - calls.append("runConversationFromInjectedReference,"); - conversationalService.initializeCount(1); - conversationalService.incrementCount(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromInjectedReference2(){ - calls.append("runConversationFromInjectedReference2,"); - - conversationalService2.initializeCount(1); - conversationalService2.incrementCount(); - - // stick in a call to the first reference to - // make sure the two references don't clash - conversationalService.initializeCount(1); - - clientCount = conversationalService2.retrieveCount(); - conversationalService2.endConversation(); - - // end the conversation through the first reference - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromServiceReference(){ - calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ - calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation1"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ - calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation2"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - return callableReference.endConversation(); - - } - public int runConversationCheckingScope(){ - calls.append("runConversationCheckingScope,"); - // run a conversation - return runConversationFromInjectedReference(); - - // test will then use a static method to find out how many times - // init/destroy were called - } - public int runConversationWithCallback(){ - calls.append("runConversationWithCallback,"); - callbackCount = 2; - conversationalService.initializeCountCallback(1); - conversationalService.incrementCountCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - - return clientCount; - } - public int runConversationHavingPassedReference(){ - calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - conversationalReferenceClient.incrementCount(serviceReference); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); - try { - conversationalService.initializeCount(1); -// conversationalService.businessException(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public String runConversationBusinessExceptionCallback(){ - calls.append("runConversationbusinessExceptionCallback,"); - try { - conversationalService.initializeCountCallback(1); -// conversationalService.businessExceptionCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public String runConversationCallingEndedConversationCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public String runConversationCallingEndedConversationCallbackCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversationCallback(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public int runConversationCallingEndedConversation(){ - calls.append("runConversationCallingEndedConversation,"); - conversationalService.initializeCount(1); - conversationalService.endConversation(); - return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ - calls.append("runConversationCallingEndedConversationCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.endConversationCallback(); - return conversationalService.retrieveCountCallback(); - } - - public int runConversationAgeTimeout(){ - calls.append("runConversationAgeTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationIdleTimeout(){ - calls.append("runConversationIdleTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationPrincipleError(){ - calls.append("runConversationPrincipleError,"); - // TODO - when policy framework is done - return clientCount; - } - - - // From ConversationalCallback - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - callbackCount += count; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - callbackCount++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return callbackCount; - } - - public void businessException() throws BusinessException { - throw new BusinessException("Business Exception"); - } - - public String endConversation(){ - calls.append("endConversation,"); - return null; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java deleted file mode 100644 index e4f83656de..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java +++ /dev/null @@ -1,318 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.BusinessException; -import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.ConversationalClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * The client for the conversational itest which presents a stateful - * callback interface - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Service(interfaces={ConversationalClient.class}) -public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback { - - @Context - protected ComponentContext componentContext; - - @Reference - protected ConversationalService conversationalService; - - @Reference - protected ConversationalService conversationalService2; - - @Reference - protected ConversationalReferenceClient conversationalReferenceClient; - - private int clientCount = 0; - private int callbackCount = 0; - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - // From ConversationalClient - public int runConversationFromInjectedReference(){ - calls.append("runConversationFromInjectedReference,"); - conversationalService.initializeCount(1); - conversationalService.incrementCount(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromInjectedReference2(){ - calls.append("runConversationFromInjectedReference2,"); - - // now test the second reference - conversationalService2.initializeCount(1); - conversationalService2.incrementCount(); - - // stick in a call to the first reference to - // make sure the two references don't clash - conversationalService.initializeCount(1); - - clientCount = conversationalService2.retrieveCount(); - conversationalService2.endConversation(); - - // end the conversation through the first reference - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromServiceReference(){ - calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ - calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation1"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ - calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation2"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - - String clientConversationId = serviceReference.getConversationID().toString(); - String serverConfersationId = callableReference.endConversation(); - - if (clientConversationId.equals("MyConversation2") && - serverConfersationId.equals("MyConversation2") ) { - return clientConversationId; - } else { - return "client = " + clientConversationId + - "server = " + serverConfersationId; - } - } - public int runConversationCheckingScope(){ - calls.append("runConversationCheckingScope,"); - // run a conversation - return runConversationFromInjectedReference(); - - // test will then use a static method to find out how many times - // init/destroy were called - } - public int runConversationWithCallback(){ - calls.append("runConversationWithCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.incrementCountCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - - return clientCount; - } - - public int runConversationHavingPassedReference(){ - calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - conversationalReferenceClient.incrementCount(serviceReference); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - serviceReference.getConversation().end(); - - return clientCount; - } - - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); - try { - conversationalService.initializeCount(1); -// conversationalService.businessException(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public String runConversationBusinessExceptionCallback(){ - calls.append("runConversationbusinessExceptionCallback,"); - try { - conversationalService.initializeCountCallback(1); -// conversationalService.businessExceptionCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public int runConversationCallingEndedConversation(){ - calls.append("runConversationCallingEndedConversation,"); - conversationalService.initializeCount(1); - conversationalService.endConversation(); - return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ - calls.append("runConversationCallingEndedConversationCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.endConversationCallback(); - return conversationalService.retrieveCountCallback(); - } - - public String runConversationCallingEndedConversationCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public String runConversationCallingEndedConversationCallbackCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversationCallback(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public int runConversationAgeTimeout(){ - calls.append("runConversationAgeTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationIdleTimeout(){ - calls.append("runConversationIdleTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationPrincipleError(){ - calls.append("runConversationPrincipleError,"); - // TODO - when policy framework is done - return clientCount; - } - - - // From ConversationalCallback - @Init - public void init(){ - calls.append("init,"); - - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - callbackCount = 0; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - callbackCount++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return callbackCount; - } - - public void businessException() throws BusinessException { - throw new BusinessException("Business Exception"); - } - - public String endConversation(){ - calls.append("endConversation,"); - callbackCount = 0; - return null; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java deleted file mode 100644 index 8fe7c5b6ba..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Service; - -/** - * A client component that accepts a reference to an ongoing conversation - * and takes part in that conversation - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Service(interfaces={ConversationalReferenceClient.class}) -public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{ - - public void incrementCount(CallableReference conversationalService){ - ConversationalService callableReference = conversationalService.getService(); - - callableReference.incrementCount(); - } - - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java deleted file mode 100644 index 9f4857f703..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * 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.conversational.impl; - -import java.util.HashMap; - -import org.apache.tuscany.sca.itest.conversational.BusinessException; -import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -/** - * The service used when testing stateful conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Service(ConversationalService.class) -@Scope("REQUEST") -public class ConversationalServiceRequestImpl implements ConversationalService { - - @ConversationID - protected String conversationId; - - @Callback - protected ConversationalCallback conversationalCallback; - - // static area in which to hold conversational data - private static HashMap conversationalState = new HashMap(); - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - Integer conversationalCount = new Integer(count); - conversationalState.put(conversationId, conversationalCount); - } - - public void incrementCount(){ - calls.append("incrementCount,"); - Integer conversationalCount = conversationalState.get(conversationId); - conversationalCount++; - conversationalState.put(conversationId, conversationalCount); - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - Integer count = conversationalState.get(conversationId); - if (count != null){ - return count.intValue(); - } else { - return -999; - } - } - - public void businessException() throws BusinessException { - throw new BusinessException("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); - initializeCount(count); - conversationalCallback.initializeCount(count); - } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); - incrementCount(); - conversationalCallback.incrementCount(); - } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); - return conversationalCallback.retrieveCount(); - } - - public void businessExceptionCallback() throws BusinessException { - calls.append("businessExceptionCallback,"); - conversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); - conversationalState.remove(conversationId); - return conversationId; - } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); - return conversationalCallback.endConversation(); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java deleted file mode 100644 index 4b06251414..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.BusinessException; -import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -/** - * The service used when testing stateful conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Service(ConversationalService.class) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalServiceStatefulImpl implements ConversationalService { - - @ConversationID - protected String conversationId; - - @Callback - protected ConversationalCallback conversationalCallback; - - // local count - accumulates during the conversation - private int count = 0; - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - this.count = count; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - count++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return count; - } - - public void businessException() throws BusinessException { - calls.append("businessException,"); - throw new BusinessException("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); - this.count = count; - conversationalCallback.initializeCount(count); - } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); - count++; - conversationalCallback.incrementCount(); - } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); - return conversationalCallback.retrieveCount(); - } - - public void businessExceptionCallback() throws BusinessException { - calls.append("businessExceptionCallback,"); - conversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); - count = 0; - return conversationId; - } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); - return conversationalCallback.endConversation(); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java deleted file mode 100644 index be039748fc..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.BusinessException; -import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -/** - * The service used when testing stateful conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Service(ConversationalServiceNonConversationalCallback.class) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback { - - @ConversationID - protected String conversationId; - - @Callback - protected NonConversationalCallback nonConversationalCallback; - - // local count - accumulates during the conversation - private int count = 0; - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - this.count = count; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - count++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return count; - } - - public void businessException() throws BusinessException { - throw new BusinessException("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); - this.count = count; - nonConversationalCallback.initializeCount(count); - } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); - count++; - nonConversationalCallback.incrementCount(); - } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); - return nonConversationalCallback.retrieveCount(); - } - - public void businessExceptionCallback() throws BusinessException { - calls.append("businessExceptionCallback,"); - nonConversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); - count = 0; - return conversationId; - } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); - return nonConversationalCallback.endConversation(); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java deleted file mode 100644 index 42f2f1a603..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * 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.conversational.impl; - -import java.util.HashMap; - -import org.apache.tuscany.sca.itest.conversational.BusinessException; -import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Service; - - -/** - * The service used when testing stateful conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Service(ConversationalService.class) -public class ConversationalServiceStatelessImpl implements ConversationalService { - - @ConversationID - protected String conversationId; - - @Callback - protected ConversationalCallback conversationalCallback; - - // static area in which to hold conversational data - private static HashMap conversationalState = new HashMap(); - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - Integer conversationalCount = new Integer(count); - conversationalState.put(conversationId, conversationalCount); - } - - public void incrementCount(){ - calls.append("incrementCount,"); - Integer conversationalCount = conversationalState.get(conversationId); - conversationalCount++; - conversationalState.put(conversationId, conversationalCount); - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - Integer count = conversationalState.get(conversationId); - if (count != null){ - return count.intValue(); - } else { - return -999; - } - } - - public void businessException() throws BusinessException { - throw new BusinessException("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); - initializeCount(count); - conversationalCallback.initializeCount(count); - } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); - incrementCount(); - conversationalCallback.incrementCount(); - } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); - return conversationalCallback.retrieveCount(); - } - - public void businessExceptionCallback() throws BusinessException { - calls.append("businessExceptionCallback,"); - conversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); - conversationalState.remove(conversationId); - return conversationId; - } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); - return conversationalCallback.endConversation(); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java deleted file mode 100644 index a852aeda56..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * 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.conversational.impl; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.tuscany.sca.itest.conversational.BusinessException; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Service; - -@Service(ConversationalService.class) -public class ConversationalServiceStatelessScopeImpl implements ConversationalService { - - @ConversationID - protected String cid; - - static Map state = new HashMap(); - - public void destroy() { - // TODO Auto-generated method stub - - } - - public String endConversation() { - state.remove(cid); - return cid; - } - - public String endConversationCallback() { - // TODO Auto-generated method stub - return null; - - } - - public void incrementCount() { - state.put(cid, Integer.valueOf(state.get(cid)+1)); - } - - public void businessException() throws BusinessException { - throw new BusinessException("Business Exception"); - } - - public void incrementCountCallback() { - // TODO Auto-generated method stub - - } - - public void init() { - // TODO Auto-generated method stub - - } - - public void initializeCount(int count) { - state.put(cid, Integer.valueOf(count)); - } - - public void initializeCountCallback(int count) { - // TODO Auto-generated method stub - - } - - public void businessExceptionCallback() throws BusinessException { - throw new BusinessException("Business Exception"); - } - - public int retrieveCount() { - return state.get(cid); - } - - public int retrieveCountCallback() { - // TODO Auto-generated method stub - return 0; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml deleted file mode 100644 index d5a1ff7410..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite deleted file mode 100644 index c4da99145d..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/Conversational/conversational.composite +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl deleted file mode 100644 index 20a92c9dc7..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml deleted file mode 100644 index 73d078674c..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite deleted file mode 100644 index 9c6b0a2b34..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java deleted file mode 100644 index 9df966ebc2..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * 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.conversational; - - -import java.io.File; - - -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -public class ConversationWSDLTestCase { - - private SCANode node; - private ConversationalClient conversationalStatelessClientStatefulService; - - @Before - public void setUp() throws Exception { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - node = nodeFactory.createSCANode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/ConversationalWSDL").toURL().toString())); - - - node.start(); - - conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService"); - - - ConversationalClientStatelessImpl.calls = new StringBuffer(); - } - - @After - public void tearDown() throws Exception { - node.stop(); - conversationalStatelessClientStatefulService = null; - } - - @Test - public void testStatelessStatefulConversationFromInjectedReference() { - int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - //@Test - public void testKeepServerRunning() throws Exception { - System.out.println("press enter to continue"); - System.in.read(); - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java deleted file mode 100644 index ebd1e55dac..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * 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.conversational; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class NonConversationalCallbackTestCase { - - private static SCANode node; - private static ConversationalClient conversationalStatelessClientStatelessService; - private static ConversationalClient conversationalStatelessClientStatefulService; - private static ConversationalClient conversationalStatefulClientStatelessService; - private static ConversationalClient conversationalStatefulClientStatefulService; - private static ConversationalClient conversationalStatelessClientRequestService; - private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; - - @BeforeClass - public static void setUp() throws Exception { - try { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/Conversational").toURL().toString())); - - - node.start(); - - conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatelessService"); - - conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatefulService"); - - conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatelessService"); - - conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatefulService"); - conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientRequestService"); - conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientNonConversationalCallbackStatefulService"); - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - - } catch(Exception ex) { - System.err.println(ex.toString()); - } - - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - conversationalStatelessClientStatelessService = null; - conversationalStatelessClientStatefulService = null; - conversationalStatefulClientStatelessService = null; - conversationalStatefulClientStatefulService = null; - conversationalStatelessClientRequestService = null; - conversationalStatefulClientNonConversationalCallbackStatelessService = null; - } - - private static void resetCallStack() { - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - - } - - // stateful client non conversational callback stateful service tests - // ================================================================== - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference2() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference2(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationFromServiceReference() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationWithUserDefinedConversationId() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationCheckingScope() { - resetCallStack(); - ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString()); - } - - //@Test - public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() { - resetCallStack(); - ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithCallback(); - Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString()); - } - - //@Test - public void testStatefulNonConversationalCallbackStatefulConversationHavingPassedReference() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationHavingPassedReference(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversation() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversation(); - Assert.assertEquals(0, count); - } - - //@Test - public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallback() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - //@Test - public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals("MyConversation3", id); - } - - - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java deleted file mode 100644 index 2c16145f54..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java +++ /dev/null @@ -1,209 +0,0 @@ -/* - * 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.conversational; - -import java.io.File; - - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class RequestScopeTestCase { - - private static SCANode node; - private static ConversationalClient conversationalStatelessClientStatelessService; - private static ConversationalClient conversationalStatelessClientStatefulService; - private static ConversationalClient conversationalStatefulClientStatelessService; - private static ConversationalClient conversationalStatefulClientStatefulService; - private static ConversationalClient conversationalStatelessClientRequestService; - private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; - - @BeforeClass - public static void setUp() throws Exception { - try { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/Conversational").toURL().toString())); - - - node.start(); - - conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatelessService"); - - conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatefulService"); - - conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatelessService"); - - conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatefulService"); - conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientRequestService"); - conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientNonConversationalCallbackStatefulService"); - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - - } catch(Exception ex) { - System.err.println(ex.toString()); - } - - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - conversationalStatelessClientStatelessService = null; - conversationalStatelessClientStatefulService = null; - conversationalStatefulClientStatelessService = null; - conversationalStatefulClientStatefulService = null; - conversationalStatelessClientRequestService = null; - conversationalStatefulClientNonConversationalCallbackStatelessService = null; - } - - private static void resetCallStack() { - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - - } - - // stateless client request scope service tests - // ============================================ - @Test - public void testStatelessRequestConversationFromInjectedReference() { - int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - //@Test - public void testStatelessRequestConversationFromInjectedReference2() { - int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference2(); - Assert.assertEquals(1, count); - } - - @Test - public void testStatelessRequestConversationFromServiceReference() { - int count = conversationalStatelessClientRequestService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessRequestConversationWithUserDefinedConversationId() { - int count = conversationalStatelessClientRequestService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - - //@Test - public void testStatelessRequestConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - //@Test - public void testStatelessRequestConversationCheckingScope() { - resetCallStack(); - ConversationalServiceRequestImpl.calls = new StringBuffer(); - conversationalStatelessClientRequestService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,", - ConversationalServiceRequestImpl.calls.toString()); - //init,initializeCount,init,incrementCount,init,retrieveCount,init,endConversation, - } - - @Test - public void testStatelessRequestConversationWithCallback() { - resetCallStack(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - int count = conversationalStatelessClientRequestService.runConversationWithCallback(); - Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", - ConversationalClientStatelessImpl.calls.toString()); - } - - //@Test - public void testStatelessRequestConversationHavingPassedReference() { - int count = conversationalStatelessClientRequestService.runConversationHavingPassedReference(); - Assert.assertEquals(3, count); - } - - //@Test - public void testStatelessRequestConversationBusinessException() { - String message = conversationalStatelessClientRequestService.runConversationBusinessException(); - Assert.assertEquals("Business Exception", message); - } - - //@Test - public void testStatelessRequestConversationBusinessExceptionCallback() { - String message = conversationalStatelessClientRequestService.runConversationBusinessExceptionCallback(); - Assert.assertEquals("Business Exception", message); - } - - @Test - public void testStatelessRequestConversationCallingEndedConversation() { - int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversation(); - Assert.assertEquals(-999, count); - } - - @Test - public void testStatelessRequestConversationCallingEndedConversationCallback() { - int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatelessRequestConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - //@Test - public void testStatelessRequestConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals(null, id); - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java deleted file mode 100644 index 4166e6acdf..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java +++ /dev/null @@ -1,193 +0,0 @@ -/* - * 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.conversational; - -import java.io.File; - - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class StatefulStatefulTestCase { - - private static SCANode node; - private static ConversationalClient conversationalStatelessClientStatelessService; - private static ConversationalClient conversationalStatelessClientStatefulService; - private static ConversationalClient conversationalStatefulClientStatelessService; - private static ConversationalClient conversationalStatefulClientStatefulService; - private static ConversationalClient conversationalStatelessClientRequestService; - private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; - - @BeforeClass - public static void setUp() throws Exception { - try { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/Conversational").toURL().toString())); - - - node.start(); - - conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatelessService"); - - conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatefulService"); - - conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatelessService"); - - conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatefulService"); - conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientRequestService"); - conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientNonConversationalCallbackStatefulService"); - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - - } catch(Exception ex) { - System.err.println(ex.toString()); - } - - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - conversationalStatelessClientStatelessService = null; - conversationalStatelessClientStatefulService = null; - conversationalStatefulClientStatelessService = null; - conversationalStatefulClientStatefulService = null; - conversationalStatelessClientRequestService = null; - conversationalStatefulClientNonConversationalCallbackStatelessService = null; - } - - private static void resetCallStack() { - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - - } - - // stateful client stateful service tests - // ====================================== - @Test - public void testStatefulStatefulConversationFromInjectedReference() { - int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatefulConversationFromInjectedReference2() { - int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference2(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatefulConversationFromServiceReference() { - int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatefulConversationWithUserDefinedConversationId() { - int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatefulConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatefulStatefulConversationCheckingScope() { - resetCallStack(); - conversationalStatefulClientStatefulService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulImpl.calls.toString()); - } - - @Test - public void testStatefulStatefulConversationWithCallback() { - resetCallStack(); - int count = conversationalStatefulClientStatefulService.runConversationWithCallback(); - Assert.assertEquals(4, count); - - Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalClientStatefulImpl.calls.toString()); - } - - //@Test - public void testStatefulStatefulConversationHavingPassedReference() { - int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference(); - Assert.assertEquals(3, count); - } - - @Test - public void testStatefulStatefulConversationCallingEndedConversation() { - int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulStatefulConversationCallingEndedConversationCallback() { - int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulStatefulConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - @Test - public void testStatefulStatefulConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals(null, id); - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java deleted file mode 100644 index 6023b7cd53..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java +++ /dev/null @@ -1,193 +0,0 @@ -/* - * 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.conversational; - -import java.io.File; - - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class StatefulStatelessTestCase { - - private static SCANode node; - private static ConversationalClient conversationalStatelessClientStatelessService; - private static ConversationalClient conversationalStatelessClientStatefulService; - private static ConversationalClient conversationalStatefulClientStatelessService; - private static ConversationalClient conversationalStatefulClientStatefulService; - private static ConversationalClient conversationalStatelessClientRequestService; - private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; - - @BeforeClass - public static void setUp() throws Exception { - try { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/Conversational").toURL().toString())); - - - node.start(); - - conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatelessService"); - - conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatefulService"); - - conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatelessService"); - - conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatefulService"); - conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientRequestService"); - conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientNonConversationalCallbackStatefulService"); - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - - } catch(Exception ex) { - System.err.println(ex.toString()); - } - - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - conversationalStatelessClientStatelessService = null; - conversationalStatelessClientStatefulService = null; - conversationalStatefulClientStatelessService = null; - conversationalStatefulClientStatefulService = null; - conversationalStatelessClientRequestService = null; - conversationalStatefulClientNonConversationalCallbackStatelessService = null; - } - - private static void resetCallStack() { - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - - } - - // stateful client stateless service tests - // ======================================= - @Test - public void testStatefulStatelessConversationFromInjectedReference() { - int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatelessConversationFromInjectedReference2() { - int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference2(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatelessConversationFromServiceReference() { - int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatelessConversationWithUserDefinedConversationId() { - int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatelessConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatefulStatelessConversationCheckingScope() { - resetCallStack(); - conversationalStatefulClientStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalServiceStatelessImpl.calls.toString()); - } - - @Test - public void testStatefulStatelessConversationWithCallback() { - resetCallStack(); - int count = conversationalStatefulClientStatelessService.runConversationWithCallback(); - Assert.assertEquals(4, count); - - Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalClientStatefulImpl.calls.toString()); - } - - //@Test - public void testStatefulStatelessConversationHavingPassedReference() { - int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference(); - Assert.assertEquals(3, count); - } - - @Test - public void testStatefulStatelessConversationCallingEndedConversation() { - int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation(); - Assert.assertEquals(-999, count); - } - - @Test - public void testStatefulStatelessConversationCallingEndedConversationCallback() { - int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulStatelessConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - @Test - public void testStatefulStatelessConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals(null, id); - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java deleted file mode 100644 index fb3a3cec6f..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * 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.conversational; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class StatelessStatefulTestCase { - - private static SCANode node; - private static ConversationalClient conversationalStatelessClientStatelessService; - private static ConversationalClient conversationalStatelessClientStatefulService; - private static ConversationalClient conversationalStatefulClientStatelessService; - private static ConversationalClient conversationalStatefulClientStatefulService; - private static ConversationalClient conversationalStatelessClientRequestService; - private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; - - @BeforeClass - public static void setUp() throws Exception { - try { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/Conversational").toURL().toString())); - - - node.start(); - - conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatelessService"); - - conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatefulService"); - - conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatelessService"); - - conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatefulService"); - conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientRequestService"); - conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientNonConversationalCallbackStatefulService"); - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - - } catch(Exception ex) { - System.err.println(ex.toString()); - } - - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - conversationalStatelessClientStatelessService = null; - conversationalStatelessClientStatefulService = null; - conversationalStatefulClientStatelessService = null; - conversationalStatefulClientStatefulService = null; - conversationalStatelessClientRequestService = null; - conversationalStatefulClientNonConversationalCallbackStatelessService = null; - } - - private static void resetCallStack() { - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - - } - - // stateless client stateful service tests - // ======================================= - @Test - public void testStatelessStatefulConversationFromInjectedReference() { - int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatefulConversationFromInjectedReference2() { - int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference2(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatefulConversationFromServiceReference() { - int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatefulConversationWithUserDefinedConversationId() { - int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatefulConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatelessStatefulConversationCheckingScope() { - resetCallStack(); - conversationalStatelessClientStatefulService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulImpl.calls.toString()); - } - - @Test - public void testStatelessStatefulConversationWithCallback() { - resetCallStack(); - int count = conversationalStatelessClientStatefulService.runConversationWithCallback(); - Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", - ConversationalClientStatelessImpl.calls.toString()); - } - - //@Test - public void testStatelessStatefulConversationHavingPassedReference() { - int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference(); - Assert.assertEquals(3, count); - } - - //@Test - public void testStatelessStatefulConversationBusinessException() { - String message = conversationalStatelessClientStatefulService.runConversationBusinessException(); - Assert.assertEquals("Business Exception", message); - } - - //@Test - public void testStatelessStatefulConversationBusinessExceptionCallback() { - String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback(); - Assert.assertEquals("Business Exception", message); - } - - @Test - public void testStatelessStatefulConversationCallingEndedConversation() { - int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatelessStatefulConversationCallingEndedConversationCallback() { - int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatelessStatefulConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - //@Test - public void testStatelessStatefulConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals(null, id); - } - - -} diff --git a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java deleted file mode 100644 index 5fbe2c3f69..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * 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.conversational; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class StatelessStatelessTestCase { - - private static SCANode node; - private static ConversationalClient conversationalStatelessClientStatelessService; - private static ConversationalClient conversationalStatelessClientStatefulService; - private static ConversationalClient conversationalStatefulClientStatelessService; - private static ConversationalClient conversationalStatefulClientStatefulService; - private static ConversationalClient conversationalStatelessClientRequestService; - private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; - - @BeforeClass - public static void setUp() throws Exception { - try { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(), - new SCAContribution("TestContribution", - new File("src/main/resources/Conversational").toURL().toString())); - - - node.start(); - - conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatelessService"); - - conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientStatefulService"); - - conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatelessService"); - - conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientStatefulService"); - conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatelessClientRequestService"); - conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class, - "ConversationalStatefulClientNonConversationalCallbackStatefulService"); - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - - } catch(Exception ex) { - System.err.println(ex.toString()); - } - - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - conversationalStatelessClientStatelessService = null; - conversationalStatelessClientStatefulService = null; - conversationalStatefulClientStatelessService = null; - conversationalStatefulClientStatefulService = null; - conversationalStatelessClientRequestService = null; - conversationalStatefulClientNonConversationalCallbackStatelessService = null; - } - - private static void resetCallStack() { - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - - } - - - // stateless client stateless service tests - // ======================================== - - @Test - public void testStatelessStatelessConversationFromInjectedReference() { - int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatelessConversationFromInjectedReference2() { - int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference2(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatelessConversationFromServiceReference() { - int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatelessConversationWithUserDefinedConversationId() { - int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - @Test - public void testStatelessStatelessConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatelessStatelessConversationCheckingScope() { - resetCallStack(); - conversationalStatelessClientStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalServiceStatelessImpl.calls.toString()); - } - - @Test - public void testStatelessStatelessConversationWithCallback() { - resetCallStack(); - int count = conversationalStatelessClientStatelessService.runConversationWithCallback(); - Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", - ConversationalClientStatelessImpl.calls.toString()); - } - //@Test - public void testStatelessStatelessConversationHavingPassedReference() { - int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference(); - Assert.assertEquals(3, count); - } - - @Test - public void testStatelessStatelessConversationCallingEndedConversation() { - int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation(); - Assert.assertEquals(-999, count); - } - - @Test - public void testStatelessStatelessConversationCallingEndedConversationCallback() { - int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatelessStatelessConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - //@Test - public void testStatelessStatelessConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals(null, id); - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/pom.xml b/tags/java/sca/1.5.1/itest/conversations/pom.xml deleted file mode 100644 index f5c80f240a..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-conversations - Apache Tuscany SCA iTest Conversations - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java deleted file mode 100644 index a3b83dfc14..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.io.Serializable; - -/** - * @version $Rev$ $Date$ - */ -public class Record implements Serializable { - public String id; - public String conversationId; -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java deleted file mode 100644 index 8e98b9cbd4..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.util.Hashtable; - -/** - * @version $Rev$ $Date$ - */ -public class TestResult { - public static Hashtable results = new Hashtable(); - private static int completed = 0; - public static synchronized void updateCompleted() { - ++completed; - } - - public static synchronized int getCompleted() { - return completed; - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java deleted file mode 100644 index e7583c339a..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Conversational; - -/** - * Simple conversational Service that uses another Conversational Service - */ -@Conversational -public interface AService { - - /** - * Returns the state for this service. - * - * @return The state for this service - */ - String getState(); - - /** - * Returns the state for the other service that this service is using - * - * @return The state for the other service that this service is using - */ - String getStateOnB(); - - /** - * Sets the state for this service. - * - * @param aState The state for this service - */ - void setState(String aState); - - /** - * Sets the state for the other service that this service is using - * - * @param aState The state for the other service that this service is using - */ - void setStateOnB(String aState); -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java deleted file mode 100644 index bc4a5fc571..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - */ - -@Remotable -public interface Alpha { - @OneWay - void run(int param); -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java deleted file mode 100644 index 77d7f4c007..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Conversational; - -/** - * Simple conversational Service - */ -@Conversational -public interface BService { - - /** - * Returns the state for this service. - * - * @return The state for this service - */ - String getState(); - - /** - * Sets the state for this service. - * - * @param aState The state for this service - */ - void setState(String aState); -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java deleted file mode 100644 index e422938b27..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - */ - -@Remotable -public interface Beta { - CallableReference getRef(int param); -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java deleted file mode 100644 index a6dbf56797..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Conversational; - -/** - * Simple conversational Service that uses another Conversational Service - */ -@Conversational -public interface CService { - - String getState(); - - void setState(String aState); - - Object getConversationID(); - - Object getConversationObjectConversationId(); - - void setConversationID(String theID); - - void endConversation(); - - void endConversationViaAnnotatedMethod(); -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java deleted file mode 100644 index 3f04e9f09e..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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.conversational; - -public interface Constants { - - String A_INITIAL_VALUE = "Initial Value of A"; - String B_INITIAL_VALUE = "Initial Value of B"; -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java deleted file mode 100644 index 53dadc3dc7..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Conversational; - -@Conversational -public interface ConversationIdService { - - String getCIDField(); - String getCIDSetter(); -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java deleted file mode 100644 index 8cad88d2f4..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - - -/** - * The callback interface used when testing conversational callbacks - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Remotable -@Conversational -public interface ConversationalCallback { - - public void init(); - - public void destroy(); - - public void initializeCount(int count); - - public void incrementCount(); - - public int retrieveCount(); - - public void businessException() throws Exception; - - @EndsConversation - public String endConversation(); - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java deleted file mode 100644 index 2532346349..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Remotable; - -/** - * The client for the conversational itest. Is implemented by clients - * offering both stateless and stateful callbacks - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Remotable -public interface ConversationalClient { - - public int runConversationFromInjectedReference(); - public int runConversationFromInjectedReference2(); - public int runConversationFromServiceReference(); - public int runConversationWithUserDefinedConversationId(); - public String runConversationCheckUserDefinedConversationId(); - public int runConversationCheckingScope(); - public int runConversationWithCallback(); - public int runConversationHavingPassedReference(); - public String runConversationBusinessException(); - public String runConversationBusinessExceptionCallback(); - public int runConversationCallingEndedConversation(); - public int runConversationCallingEndedConversationCallback(); - public String runConversationCallingEndedConversationCheckConversationId(); - public String runConversationCallingEndedConversationCallbackCheckConversationId(); - public int runConversationAgeTimeout(); - public int runConversationIdleTimeout(); - public int runConversationPrincipleError(); -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java deleted file mode 100644 index 8f008fa711..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -/** - * The client that calls into an existing conversation by accepting - * a reference to that conversation - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Remotable -public interface ConversationalReferenceClient { - - public void incrementCount(CallableReference conversationalService); - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java deleted file mode 100644 index 546382cfd1..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - - -/** - * The service interface used when testing conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Remotable -@Conversational -@Callback(ConversationalCallback.class) -public interface ConversationalService { - - public void init(); - - public void destroy(); - - public void initializeCount(int count); - - public void incrementCount(); - - public int retrieveCount(); - - public void businessException() throws Exception; - - public void initializeCountCallback(int count); - - public void incrementCountCallback(); - - public int retrieveCountCallback(); - - public void businessExceptionCallback() throws Exception; - - @EndsConversation - public String endConversation(); - - public String endConversationCallback(); - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java deleted file mode 100644 index f1a21cc18f..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - - -/** - * The service interface used when testing conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Remotable -@Conversational -@Callback(NonConversationalCallback.class) -public interface ConversationalServiceNonConversationalCallback { - - public void init(); - - public void destroy(); - - public void initializeCount(int count); - - public void incrementCount(); - - public int retrieveCount(); - - public void businessException() throws Exception; - - public void initializeCountCallback(int count); - - public void incrementCountCallback(); - - public int retrieveCountCallback(); - - public void businessExceptionCallback() throws Exception; - - @EndsConversation - public String endConversation(); - - public String endConversationCallback(); - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java deleted file mode 100644 index 74afbfb763..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; - -/** - * Simple conversational Service - */ -@Conversational -public interface DService { - - /** - * Returns the state for this service. - * - * @return The state for this service - */ - String getState(); - - /** - * Sets the state for this service. - * - * @param aState The state for this service - */ - void setState(String aState); - - @EndsConversation - void endConversationViaAnnotatedMethod(); -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java deleted file mode 100644 index 5f97b16088..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.conversational; - -import org.apache.tuscany.sca.itest.Record; -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - */ - -@Remotable -@Conversational -public interface Gamma { - void start(int param); - - boolean hasNext(); - - Record next(); - - @EndsConversation - void stop(); -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java deleted file mode 100644 index 3ce3e3ada7..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.conversational; - -import org.osoa.sca.annotations.Remotable; - - -/** - * The callback interface used when testing conversational callbacks - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Remotable -public interface NonConversationalCallback { - - public void init(); - - public void destroy(); - - public void initializeCount(int count); - - public void incrementCount(); - - public int retrieveCount(); - - public void businessException() throws Exception; - - public String endConversation(); - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java deleted file mode 100644 index 95c9c7ae6e..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * 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.conversational.impl; - -import java.lang.reflect.Proxy; -import org.apache.tuscany.sca.core.invocation.JDKInvocationHandler; - -import org.apache.tuscany.sca.itest.conversational.AService; -import org.apache.tuscany.sca.itest.conversational.BService; -import org.apache.tuscany.sca.itest.conversational.Constants; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Simple conversational Service that uses another Conversational Service - */ -@Service(AService.class) -@Scope("CONVERSATION") -public class AServiceImpl implements AService { - - /** - * The state - */ - private String state = Constants.A_INITIAL_VALUE; - - /** - * The reference to the other service - */ - private BService b; - - /** - * Constructor - * - */ - public AServiceImpl() { - System.out.println("---> AServiceImpl constructor for " + this); - } - - /** - * Inject the reference to the other service - * @param aB The other service. - */ - @Reference(name="b") - public void setB(BService aB) { - System.out.println("---> Setting reference to B on " + this + " to " + aB); - this.b = aB; - } - - /** - * Returns the state for this service. - * - * @return The state for this service - */ - public String getState() { - return state; - } - - /** - * Returns the state for the other service that this service is using - * - * @return The state for the other service that this service is using - */ - public String getStateOnB() { - return b.getState(); - } - - /** - * Sets the state for this service. - * - * @param aState The state for this service - */ - public void setState(String aState) { - this.state = aState; - } - - /** - * Sets the state for the other service that this service is using - * - * @param aState The state for the other service that this service is using - */ - public void setStateOnB(String aState) { - b.setState(aState); - } - - /** - * Sets the conversation ID for this service - * @param id The Conversation ID - */ - @ConversationID - public void setConversationID(String id) { - System.out.println("Conversation ID for " + this + " is set to " + id); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java deleted file mode 100644 index a5f37f7a52..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.Record; -import org.apache.tuscany.sca.itest.TestResult; -import org.apache.tuscany.sca.itest.conversational.Alpha; -import org.apache.tuscany.sca.itest.conversational.Beta; -import org.apache.tuscany.sca.itest.conversational.Gamma; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * @version $Rev$ $Date$ - */ - -@Service(Alpha.class) -@Scope("COMPOSITE") -public class AlphaImpl implements Alpha { - @Reference - public Beta beta; - - @Context - protected ComponentContext componentContext; - - public void run(int param) { - CallableReference gammaRef = null; - boolean testPassed = true; - try { - gammaRef = beta.getRef(param); - while (gammaRef.getService().hasNext()) { - Record record = gammaRef.getService().next(); - if (!record.conversationId.equals(gammaRef.getConversation().getConversationID())) { - // Record returned is not from this conversation. - testPassed = false; - } - } - } catch (Exception ex) { - testPassed = false; - ex.printStackTrace(); - } finally { - TestResult.updateCompleted(); - if (gammaRef != null) { - TestResult.results.put(gammaRef.getConversation() - .getConversationID(), testPassed); - gammaRef.getService().stop(); - } - } - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java deleted file mode 100644 index c1e27641ef..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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.conversational.impl; - - -import org.apache.tuscany.sca.itest.conversational.BService; -import org.apache.tuscany.sca.itest.conversational.Constants; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Simple conversational Service - */ -@Service(BService.class) -@Scope("CONVERSATION") -public class BServiceImpl implements BService { - - /** - * The state for this service - */ - private String state = Constants.B_INITIAL_VALUE; - - /** - * Constructor - */ - public BServiceImpl() { - System.out.println("---> BServiceImpl constructor for " + this); - } - - /** - * Returns the state for this service. - * - * @return The state for this service - */ - public String getState() { - return state; - } - - /** - * Sets the state for this service. - * - * @param aState The state for this service - */ - public void setState(String aState) { - this.state = aState; - } - - /** - * Sets the conversation ID for this service - * @param id The Conversation ID - */ - @ConversationID - public void setConversationID(String id) { - System.out.println("Conversation ID for " + this + " is set to " + id); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java deleted file mode 100644 index 900b8f743f..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.Beta; -import org.apache.tuscany.sca.itest.conversational.Gamma; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * @version $Rev$ $Date$ - */ - -@Service(Beta.class) -@Scope("COMPOSITE") -public class BetaImpl implements Beta { - @Context - protected ComponentContext componentContext; - - @Reference - public Gamma gamma; - - public CallableReference getRef(int param) { - ServiceReference gammaRef = componentContext - .getServiceReference(Gamma.class, "gamma"); - Gamma g = gammaRef.getService(); - g.start(param); - return gammaRef; - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java deleted file mode 100644 index b21f956bd9..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.CService; -import org.apache.tuscany.sca.itest.conversational.DService; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Simple conversational Service that uses another Conversational Service - */ -@Service(CService.class) -@Scope("CONVERSATION") -public class CServiceImpl implements CService { - - private ServiceReference dServiceRef; - - @Reference(name = "d") - public void setD(ServiceReference servRef) { - this.dServiceRef = servRef; - } - - public String getState() { - return dServiceRef.getService().getState(); - } - - public void setState(String aState) { - dServiceRef.getService().setState(aState); - } - - - /* - * When the coversationId is set manually the client may access the - * conversation id that will be used by the reference using - * ServiceReference.getConversationId() - */ - public Object getConversationID() { - return dServiceRef.getConversationID(); - } - - /* - * Whether the conversation ID is chosen by the client or is generated by - * the system, the client may access the conversation ID by calling - * Conversation.getConversationID(). - */ - public Object getConversationObjectConversationId() { - // TODO Auto-generated method stub - if (dServiceRef.getConversation() != null){ - return dServiceRef.getConversation().getConversationID(); - } else { - return null; - } - } - - public void endConversation() { - dServiceRef.getConversation().end(); - } - - public void endConversationViaAnnotatedMethod() { - dServiceRef.getService().endConversationViaAnnotatedMethod(); - } - - public void setConversationID(String theID) { - dServiceRef.setConversationID(theID); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java deleted file mode 100644 index 9deef312ac..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(ConversationalService.class) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="1 seconds") -public class ConversationAgeComponentImpl implements ConversationalService { - - private int count; - - public void businessException() throws Exception { - } - - public void businessExceptionCallback() throws Exception { - } - - public void destroy() { - } - - public String endConversation() { - return null; - } - - public String endConversationCallback() { - return null; - } - - public void incrementCount() { - } - - public void incrementCountCallback() { - } - - public void init() { - } - - public void initializeCount(int count) { - this.count = count; - } - - public void initializeCountCallback(int count) { - } - - public int retrieveCount() { - return count; - } - - public int retrieveCountCallback() { - return 0; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java deleted file mode 100644 index cffa76186a..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationIdService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(ConversationIdService.class) -@Scope("CONVERSATION") -public class ConversationIdComponentImpl implements ConversationIdService { - - @ConversationID - public String cid; - - private String setterCid; - - public String getCIDField() { - return cid; - } - public String getCIDSetter() { - return setterCid; - } - - - @ConversationID - public void setCID(String cid) { - this.setterCid = cid; - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java deleted file mode 100644 index 1272c7ab7f..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -@Service(ConversationalService.class) -@Scope("CONVERSATION") -@ConversationAttributes(maxIdleTime="1 seconds") -public class ConversationMaxIdleComponentImpl implements ConversationalService { - - private int count; - - public void businessException() throws Exception { - } - - public void businessExceptionCallback() throws Exception { - } - - public void destroy() { - } - - public String endConversation() { - return null; - } - - public String endConversationCallback() { - return null; - } - - public void incrementCount() { - } - - public void incrementCountCallback() { - } - - public void init() { - } - - public void initializeCount(int count) { - this.count = count; - } - - public void initializeCountCallback(int count) { - } - - public int retrieveCount() { - return count; - } - - public int retrieveCountCallback() { - return 0; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java deleted file mode 100644 index 847b038881..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java +++ /dev/null @@ -1,321 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.ConversationalClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * The client for the conversational itest which presents a stateful - * callback interface - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Service(interfaces={ConversationalClient.class}) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback { - - @Context - protected ComponentContext componentContext; - - @Reference - protected ConversationalService conversationalService; - - @Reference - protected ConversationalService conversationalService2; - - @Reference - protected ConversationalReferenceClient conversationalReferenceClient; - - private int clientCount = 0; - private int callbackCount = 0; - - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - // From ConversationalClient - public int runConversationFromInjectedReference(){ - calls.append("runConversationFromInjectedReference,"); - conversationalService.initializeCount(1); - conversationalService.incrementCount(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromInjectedReference2(){ - calls.append("runConversationFromInjectedReference2,"); - - conversationalService2.initializeCount(1); - conversationalService2.incrementCount(); - - // stick in a call to the first reference to - // make sure the two references don't clash - conversationalService.initializeCount(1); - - clientCount = conversationalService2.retrieveCount(); - conversationalService2.endConversation(); - - // end the conversation through the first reference - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromServiceReference(){ - calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ - calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation1"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ - calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation2"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - - String clientConversationId = serviceReference.getConversationID().toString(); - String serverConversationId = callableReference.endConversation(); - - if (clientConversationId.equals("MyConversation2") && - serverConversationId.equals("MyConversation2") ) { - return clientConversationId; - } else { - return "client = " + clientConversationId + - "server = " + serverConversationId; - } - - } - public int runConversationCheckingScope(){ - calls.append("runConversationCheckingScope,"); - // run a conversation - return runConversationFromInjectedReference(); - - // test will then use a static method to find out how many times - // init/destroy were called - } - public int runConversationWithCallback(){ - calls.append("runConversationWithCallback,"); - callbackCount = 2; - conversationalService.initializeCountCallback(1); - conversationalService.incrementCountCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - - return clientCount; - } - public int runConversationHavingPassedReference(){ - calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - conversationalReferenceClient.incrementCount(serviceReference); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); - try { - conversationalService.initializeCount(1); - conversationalService.businessException(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public String runConversationBusinessExceptionCallback(){ - calls.append("runConversationbusinessExceptionCallback,"); - try { - conversationalService.initializeCountCallback(1); - conversationalService.businessExceptionCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public int runConversationCallingEndedConversation(){ - calls.append("runConversationCallingEndedConversation,"); - conversationalService.initializeCount(1); - conversationalService.endConversation(); - return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ - calls.append("runConversationCallingEndedConversationCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.endConversationCallback(); - return conversationalService.retrieveCountCallback(); - } - - public String runConversationCallingEndedConversationCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public String runConversationCallingEndedConversationCallbackCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversationCallback(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public int runConversationAgeTimeout(){ - calls.append("runConversationAgeTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationIdleTimeout(){ - calls.append("runConversationIdleTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationPrincipleError(){ - calls.append("runConversationPrincipleError,"); - // TODO - when policy framework is done - return clientCount; - } - - - // From ConversationalCallback - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - callbackCount += count; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - callbackCount++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return callbackCount; - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public String endConversation(){ - calls.append("endConversation,"); - callbackCount = 0; - return null; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java deleted file mode 100644 index b77e4c0194..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java +++ /dev/null @@ -1,310 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationalClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * The client for the conversational itest which presents a stateful - * callback interface - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Service(interfaces={ConversationalClient.class}) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback { - - @Context - protected ComponentContext componentContext; - - @Reference - protected ConversationalService conversationalService; - - @Reference - protected ConversationalService conversationalService2; - - @Reference - protected ConversationalReferenceClient conversationalReferenceClient; - - private int clientCount = 0; - private int callbackCount = 0; - - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - // From ConversationalClient - public int runConversationFromInjectedReference(){ - calls.append("runConversationFromInjectedReference,"); - conversationalService.initializeCount(1); - conversationalService.incrementCount(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromInjectedReference2(){ - calls.append("runConversationFromInjectedReference2,"); - - conversationalService2.initializeCount(1); - conversationalService2.incrementCount(); - - // stick in a call to the first reference to - // make sure the two references don't clash - conversationalService.initializeCount(1); - - clientCount = conversationalService2.retrieveCount(); - conversationalService2.endConversation(); - - // end the conversation through the first reference - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromServiceReference(){ - calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ - calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation1"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ - calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation2"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - return callableReference.endConversation(); - - } - public int runConversationCheckingScope(){ - calls.append("runConversationCheckingScope,"); - // run a conversation - return runConversationFromInjectedReference(); - - // test will then use a static method to find out how many times - // init/destroy were called - } - public int runConversationWithCallback(){ - calls.append("runConversationWithCallback,"); - callbackCount = 2; - conversationalService.initializeCountCallback(1); - conversationalService.incrementCountCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - - return clientCount; - } - public int runConversationHavingPassedReference(){ - calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - conversationalReferenceClient.incrementCount(serviceReference); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); - try { - conversationalService.initializeCount(1); - conversationalService.businessException(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public String runConversationBusinessExceptionCallback(){ - calls.append("runConversationbusinessExceptionCallback,"); - try { - conversationalService.initializeCountCallback(1); - conversationalService.businessExceptionCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public String runConversationCallingEndedConversationCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public String runConversationCallingEndedConversationCallbackCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversationCallback(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public int runConversationCallingEndedConversation(){ - calls.append("runConversationCallingEndedConversation,"); - conversationalService.initializeCount(1); - conversationalService.endConversation(); - return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ - calls.append("runConversationCallingEndedConversationCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.endConversationCallback(); - return conversationalService.retrieveCountCallback(); - } - - public int runConversationAgeTimeout(){ - calls.append("runConversationAgeTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationIdleTimeout(){ - calls.append("runConversationIdleTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationPrincipleError(){ - calls.append("runConversationPrincipleError,"); - // TODO - when policy framework is done - return clientCount; - } - - - // From ConversationalCallback - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - callbackCount += count; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - callbackCount++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return callbackCount; - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public String endConversation(){ - calls.append("endConversation,"); - return null; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java deleted file mode 100644 index 5b3906fc2c..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java +++ /dev/null @@ -1,317 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.ConversationalClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * The client for the conversational itest which presents a stateful - * callback interface - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Service(interfaces={ConversationalClient.class}) -public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback { - - @Context - protected ComponentContext componentContext; - - @Reference - protected ConversationalService conversationalService; - - @Reference - protected ConversationalService conversationalService2; - - @Reference - protected ConversationalReferenceClient conversationalReferenceClient; - - private int clientCount = 0; - private int callbackCount = 0; - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - // From ConversationalClient - public int runConversationFromInjectedReference(){ - calls.append("runConversationFromInjectedReference,"); - conversationalService.initializeCount(1); - conversationalService.incrementCount(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromInjectedReference2(){ - calls.append("runConversationFromInjectedReference2,"); - - // now test the second reference - conversationalService2.initializeCount(1); - conversationalService2.incrementCount(); - - // stick in a call to the first reference to - // make sure the two references don't clash - conversationalService.initializeCount(1); - - clientCount = conversationalService2.retrieveCount(); - conversationalService2.endConversation(); - - // end the conversation through the first reference - conversationalService.endConversation(); - - return clientCount; - } - public int runConversationFromServiceReference(){ - calls.append("runConversationFromServiceReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public int runConversationWithUserDefinedConversationId(){ - calls.append("runConversationWithUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation1"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - // serviceReference.getConversation().end(); - - return clientCount; - } - public String runConversationCheckUserDefinedConversationId(){ - calls.append("runConversationCheckUserDefinedConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation2"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - - String clientConversationId = serviceReference.getConversationID().toString(); - String serverConfersationId = callableReference.endConversation(); - - if (clientConversationId.equals("MyConversation2") && - serverConfersationId.equals("MyConversation2") ) { - return clientConversationId; - } else { - return "client = " + clientConversationId + - "server = " + serverConfersationId; - } - } - public int runConversationCheckingScope(){ - calls.append("runConversationCheckingScope,"); - // run a conversation - return runConversationFromInjectedReference(); - - // test will then use a static method to find out how many times - // init/destroy were called - } - public int runConversationWithCallback(){ - calls.append("runConversationWithCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.incrementCountCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - - return clientCount; - } - - public int runConversationHavingPassedReference(){ - calls.append("runConversationHavingPassedReference,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - conversationalReferenceClient.incrementCount(serviceReference); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - serviceReference.getConversation().end(); - - return clientCount; - } - - public String runConversationBusinessException(){ - calls.append("runConversationbusinessException,"); - try { - conversationalService.initializeCount(1); - conversationalService.businessException(); - clientCount = conversationalService.retrieveCount(); - conversationalService.endConversation(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public String runConversationBusinessExceptionCallback(){ - calls.append("runConversationbusinessExceptionCallback,"); - try { - conversationalService.initializeCountCallback(1); - conversationalService.businessExceptionCallback(); - clientCount = conversationalService.retrieveCountCallback(); - conversationalService.endConversationCallback(); - } catch(Exception ex) { - return ex.getMessage(); - } - - return "No Exception Returned"; - } - - public int runConversationCallingEndedConversation(){ - calls.append("runConversationCallingEndedConversation,"); - conversationalService.initializeCount(1); - conversationalService.endConversation(); - return conversationalService.retrieveCount(); - } - - public int runConversationCallingEndedConversationCallback(){ - calls.append("runConversationCallingEndedConversationCallback,"); - conversationalService.initializeCountCallback(1); - conversationalService.endConversationCallback(); - return conversationalService.retrieveCountCallback(); - } - - public String runConversationCallingEndedConversationCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversation(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public String runConversationCallingEndedConversationCallbackCheckConversationId(){ - calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,"); - ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class, - "conversationalService"); - serviceReference.setConversationID("MyConversation3"); - - ConversationalService callableReference = serviceReference.getService(); - - callableReference.initializeCount(1); - callableReference.incrementCount(); - clientCount = callableReference.retrieveCount(); - callableReference.endConversationCallback(); - - if (serviceReference.getConversation() ==null ) { - return null; - } else { - return serviceReference.getConversation().getConversationID().toString(); - } - } - - public int runConversationAgeTimeout(){ - calls.append("runConversationAgeTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationIdleTimeout(){ - calls.append("runConversationIdleTimeout,"); - // done in other testing - return clientCount; - } - public int runConversationPrincipleError(){ - calls.append("runConversationPrincipleError,"); - // TODO - when policy framework is done - return clientCount; - } - - - // From ConversationalCallback - @Init - public void init(){ - calls.append("init,"); - - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - callbackCount = 0; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - callbackCount++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return callbackCount; - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public String endConversation(){ - calls.append("endConversation,"); - callbackCount = 0; - return null; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java deleted file mode 100644 index 8fe7c5b6ba..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Service; - -/** - * A client component that accepts a reference to an ongoing conversation - * and takes part in that conversation - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ - -@Service(interfaces={ConversationalReferenceClient.class}) -public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{ - - public void incrementCount(CallableReference conversationalService){ - ConversationalService callableReference = conversationalService.getService(); - - callableReference.incrementCount(); - } - - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java deleted file mode 100644 index 9a25f0f59a..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * 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.conversational.impl; - -import java.util.HashMap; - -import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -/** - * The service used when testing stateful conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Service(ConversationalService.class) -@Scope("REQUEST") -public class ConversationalServiceRequestImpl implements ConversationalService { - - @ConversationID - protected String conversationId; - - @Callback - protected ConversationalCallback conversationalCallback; - - // static area in which to hold conversational data - private static HashMap conversationalState = new HashMap(); - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - Integer conversationalCount = new Integer(count); - conversationalState.put(conversationId, conversationalCount); - } - - public void incrementCount(){ - calls.append("incrementCount,"); - Integer conversationalCount = conversationalState.get(conversationId); - conversationalCount++; - conversationalState.put(conversationId, conversationalCount); - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - Integer count = conversationalState.get(conversationId); - if (count != null){ - return count.intValue(); - } else { - return -999; - } - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); - initializeCount(count); - conversationalCallback.initializeCount(count); - } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); - incrementCount(); - conversationalCallback.incrementCount(); - } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); - return conversationalCallback.retrieveCount(); - } - - public void businessExceptionCallback() throws Exception { - calls.append("businessExceptionCallback,"); - conversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); - conversationalState.remove(conversationId); - return conversationId; - } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); - return conversationalCallback.endConversation(); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java deleted file mode 100644 index efcbdff06f..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -/** - * The service used when testing stateful conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Service(ConversationalService.class) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalServiceStatefulImpl implements ConversationalService { - - @ConversationID - protected String conversationId; - - @Callback - protected ConversationalCallback conversationalCallback; - - // local count - accumulates during the conversation - private int count = 0; - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - this.count = count; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - count++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return count; - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); - this.count = count; - conversationalCallback.initializeCount(count); - } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); - count++; - conversationalCallback.incrementCount(); - } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); - return conversationalCallback.retrieveCount(); - } - - public void businessExceptionCallback() throws Exception { - calls.append("businessExceptionCallback,"); - conversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); - count = 0; - return conversationId; - } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); - return conversationalCallback.endConversation(); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java deleted file mode 100644 index 8454b3846b..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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.conversational.impl; - -import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationAttributes; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -/** - * The service used when testing stateful conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Service(ConversationalServiceNonConversationalCallback.class) -@Scope("CONVERSATION") -@ConversationAttributes(maxAge="10 minutes", - maxIdleTime="5 minutes", - singlePrincipal=false) -public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback { - - @ConversationID - protected String conversationId; - - @Callback - protected NonConversationalCallback nonConversationalCallback; - - // local count - accumulates during the conversation - private int count = 0; - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - this.count = count; - } - - public void incrementCount(){ - calls.append("incrementCount,"); - count++; - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - return count; - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); - this.count = count; - nonConversationalCallback.initializeCount(count); - } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); - count++; - nonConversationalCallback.incrementCount(); - } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); - return nonConversationalCallback.retrieveCount(); - } - - public void businessExceptionCallback() throws Exception { - calls.append("businessExceptionCallback,"); - nonConversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); - count = 0; - return conversationId; - } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); - return nonConversationalCallback.endConversation(); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java deleted file mode 100644 index 07186c91e1..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * 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.conversational.impl; - -import java.util.HashMap; - -import org.apache.tuscany.sca.itest.conversational.ConversationalCallback; -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Destroy; -import org.osoa.sca.annotations.Init; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -/** - * The service used when testing stateful conversations - * - * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $ - */ -@Service(ConversationalService.class) -@Scope("STATELESS") -public class ConversationalServiceStatelessImpl implements ConversationalService { - - @ConversationID - protected String conversationId; - - @Callback - protected ConversationalCallback conversationalCallback; - - // static area in which to hold conversational data - private static HashMap conversationalState = new HashMap(); - - // a static member variable that records the number of times this service is called - public static StringBuffer calls = new StringBuffer(); - - @Init - public void init(){ - calls.append("init,"); - } - - @Destroy - public void destroy(){ - calls.append("destroy,"); - } - - public void initializeCount(int count){ - calls.append("initializeCount,"); - Integer conversationalCount = new Integer(count); - conversationalState.put(conversationId, conversationalCount); - } - - public void incrementCount(){ - calls.append("incrementCount,"); - Integer conversationalCount = conversationalState.get(conversationId); - conversationalCount++; - conversationalState.put(conversationId, conversationalCount); - } - - public int retrieveCount(){ - calls.append("retrieveCount,"); - Integer count = conversationalState.get(conversationId); - if (count != null){ - return count.intValue(); - } else { - return -999; - } - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public void initializeCountCallback(int count){ - calls.append("initializeCountCallback,"); - initializeCount(count); - conversationalCallback.initializeCount(count); - } - - public void incrementCountCallback(){ - calls.append("incrementCountCallback,"); - incrementCount(); - conversationalCallback.incrementCount(); - } - - public int retrieveCountCallback(){ - calls.append("retrieveCountCallback,"); - return conversationalCallback.retrieveCount(); - } - - public void businessExceptionCallback() throws Exception { - calls.append("businessExceptionCallback,"); - conversationalCallback.businessException(); - } - - public String endConversation(){ - calls.append("endConversation,"); - conversationalState.remove(conversationId); - return conversationId; - } - - public String endConversationCallback(){ - calls.append("endConversationCallback,"); - return conversationalCallback.endConversation(); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java deleted file mode 100644 index 344aa99dff..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * 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.conversational.impl; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.tuscany.sca.itest.conversational.ConversationalService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Service; - -@Service(ConversationalService.class) -public class ConversationalServiceStatelessScopeImpl implements ConversationalService { - - @ConversationID - protected String cid; - - static Map state = new HashMap(); - - public void destroy() { - // TODO Auto-generated method stub - - } - - public String endConversation() { - state.remove(cid); - return cid; - } - - public String endConversationCallback() { - // TODO Auto-generated method stub - return null; - - } - - public void incrementCount() { - state.put(cid, Integer.valueOf(state.get(cid)+1)); - } - - public void businessException() throws Exception { - throw new Exception("Business Exception"); - } - - public void incrementCountCallback() { - // TODO Auto-generated method stub - - } - - public void init() { - // TODO Auto-generated method stub - - } - - public void initializeCount(int count) { - state.put(cid, Integer.valueOf(count)); - } - - public void initializeCountCallback(int count) { - // TODO Auto-generated method stub - - } - - public void businessExceptionCallback() throws Exception { - throw new Exception("Business Exception"); - } - - public int retrieveCount() { - return state.get(cid); - } - - public int retrieveCountCallback() { - // TODO Auto-generated method stub - return 0; - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java deleted file mode 100644 index 8d79bb75e8..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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.conversational.impl; - - -import org.apache.tuscany.sca.itest.conversational.Constants; -import org.apache.tuscany.sca.itest.conversational.DService; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Simple conversational Service - */ -@Service(DService.class) -@Scope("CONVERSATION") -public class DServiceImpl implements DService { - - /** - * The state for this service - */ - private String state = "Initial state value"; - - /** - * Returns the state for this service. - * - * @return The state for this service - */ - public String getState() { - return state; - } - - /** - * Sets the state for this service. - * - * @param aState The state for this service - */ - public void setState(String aState) { - this.state = aState; - } - - /** - * Sets the conversation ID for this service - * @param id The Conversation ID - */ - @ConversationID - public void setConversationID(String id) { - System.out.println ("Setting conversation ID at service = " + id ); - } - - public void endConversationViaAnnotatedMethod() { - System.out.println ("Annotated Ends Conversation"); - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java deleted file mode 100644 index d1b769216b..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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.conversational.impl; - -import java.util.ArrayList; - -import org.apache.tuscany.sca.itest.Record; -import org.apache.tuscany.sca.itest.conversational.Gamma; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * @version $Rev$ $Date$ - */ - -@Service(Gamma.class) -@Scope("CONVERSATION") -public class GammaImpl implements Gamma { - @ConversationID - public String conversationId; - - private ArrayList list; - - public void start(int param) { - list = new ArrayList(); - fillList(param, conversationId); - } - - public boolean hasNext() { - return !list.isEmpty(); - } - - public Record next() { - return list.remove(0); - } - - public void stop() { - list = null; - } - - private void fillList(int param, String cid) { - for (int i = 0; i < param; i++) { - Record record = new Record(); - record.id = "id_" + i; - record.conversationId = cid; - list.add(record); - } - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationAge.composite b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationAge.composite deleted file mode 100644 index abd1c35ced..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationAge.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationUniqueId.composite b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationUniqueId.composite deleted file mode 100644 index 831449a079..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/resources/ConversationUniqueId.composite +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationId.composite b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationId.composite deleted file mode 100644 index e61eb08194..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationId.composite +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationLifetime.composite b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationLifetime.composite deleted file mode 100644 index 3b79dc43d9..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversationLifetime.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversational.composite b/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversational.composite deleted file mode 100644 index 4da3ce74d5..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/main/resources/conversational.composite +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java deleted file mode 100644 index 3e750bdd1e..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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.conversational; - - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -public class ConversationIdTestCase { - - private SCADomain domain; - - @Before - public void setUp() throws Exception { - domain = SCADomain.newInstance("conversationId.composite"); - - } - - @After - public void tearDown() throws Exception { - if (domain != null) { - domain.close(); - } - } - - @Test - public void testConversationId() { - ConversationIdService service = - domain.getService(ConversationIdService.class, "ConversationIdComponent"); - Assert.assertNotNull(service.getCIDField()); - Assert.assertNotNull(service.getCIDSetter()); - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java deleted file mode 100644 index 326a833a42..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * 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.conversational; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -public class ConversationLifetimeTestCase { - - private SCADomain domain; - - @Before - public void setUp() throws Exception { - domain = SCADomain.newInstance("conversationLifetime.composite"); - } - - @After - public void tearDown() throws Exception { - if (domain != null) { - domain.close(); - } - } - - /** - * Following a clarification re. the wording of the Java Common Annotations and APIs 1.00 Specification - * (see TUSCANY-2055) the following is accepted to be the intended operation - * - * Whether the conversation ID is chosen by the user or is generated by the system, the client - * may access the conversation ID by calling getConversationID() on the current conversation object. - * - * ServiceReference.getConversationID() - Returns the id supplied by the user that will be associated with - * future conversations initiated through this reference, or null if no ID has been set by the user. - * - * ServiceReference.setConversationID(Object conversationId) - Set an ID, supplied by the user, to associate with any future conversation - * started through this reference. If the value supplied is null then the id will be generated - * by the implementation. Throws an IllegalStateException if a conversation is currently - * associated with this reference. - * - */ - - /** - * Verify that ServiceReference.getConversationID() returns null before a conversation - * ID has been set manually. - */ - @Test - public void getConversationID() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); - service.getState(); - Assert.assertNull(service.getConversationID()); - } - - /** - * Verify that ServiceReference.getConversationID() returns any value previous set through the - * setConversationID() API. - */ - @Test - public void getConversationID2() { - String userProvidedID = "A conversation ID"; - CService service = domain.getService(CService.class, "ConversationalCComponent"); - service.setConversationID(userProvidedID); - service.getState(); - Assert.assertEquals(service.getConversationID(), userProvidedID); - } - - /** - * Whether the conversation ID is chosen by the user or is generated by the system, the client - * may access the conversation ID by calling getConversationID() on the current conversation object. - * Here test the manually set conversationID - */ - @Test - public void getConversationID3() { - String userProvidedID = "A conversation ID"; - CService service = domain.getService(CService.class, "ConversationalCComponent"); - service.setConversationID(userProvidedID); - service.getState(); - Assert.assertEquals(service.getConversationObjectConversationId(), userProvidedID); - } - - /** - * Whether the conversation ID is chosen by the user or is generated by the system, the client - * may access the conversation ID by calling getConversationID() on the current conversation object. - * Here test the auto generated conversationId - */ - @Test - public void getConversationID4() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); - service.getState(); - Assert.assertNotNull(service.getConversationObjectConversationId()); - } - - /** - * Java Common Annotations and APIs 1.00 Specification line 494-495 Verify: - * If a method is invoked on a service reference after an - * "@EndsConversation" method has been called then a new conversation will - * automatically be started. - */ - @Test - public void implicitStartNewConversationAfterEnd() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); - service.getState(); - Object firstID = service.getConversationObjectConversationId(); - service.endConversationViaAnnotatedMethod(); - service.getState(); - Assert.assertNotSame(firstID, service.getConversationObjectConversationId()); - } - - /** - * Java Common Annotations and APIs 1.00 Specification line 495-495 Verify: If a - * method is invoked on a service reference after an "@EndsConversation" - * method has been called then a new conversation will automatically be - * started. Note: Uses Conversation.end() rather than "@EndsConversation" - */ - @Test - public void implicitStartNewConversationAfterEnd2() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); - service.getState(); - Object firstID = service.getConversationObjectConversationId(); - service.endConversation(); - service.getState(); - Assert.assertNotSame(firstID, service.getConversationObjectConversationId()); - } - - /** - * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: - * If ServiceReference.getConversationID() is called after the - * "@EndsConversation" method is called, but before the next conversation - * has been started, it will return null. - */ - @Test - public void nullConversationIDAfterEndConversation() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); - service.getState(); - service.endConversationViaAnnotatedMethod(); - Assert.assertNull(service.getConversationObjectConversationId()); - } - - /** - * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: - * If ServiceReference.getConversationID() is called after the - * "@EndsConversation" method is called, but before the next conversation - * has been started, it will return null. Note: Uses explicit set of Conversation ID - */ - @Test - public void nullConversationIDAfterEndConversation1a() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); - service.setConversationID("User provided ID"); - service.getState(); - service.endConversationViaAnnotatedMethod(); - Assert.assertNull(service.getConversationObjectConversationId()); - } - - /** - * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: If - * ServiceReference.getConversationID() is called after the - * "@EndsConversationmethod" is called, but before the next conversation has - * been started, it will return null. Note: Uses Conversation.end() rather - * than "@EndsConversation" - */ - @Test - public void nullConversationIDAfterEndConversation2() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); - service.getState(); - service.endConversation(); - Assert.assertNull(service.getConversationObjectConversationId()); - } - - /** - * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: If - * ServiceReference.getConversationID() is called after the - * "@EndsConversationmethod" is called, but before the next conversation has - * been started, it will return null. Note: Uses Conversation.end() rather - * than "@EndsConversation". Note 2: Uses explicit set of Conversation ID - */ - @Test - public void nullConversationIDAfterEndConversation2a() { - CService service = domain.getService(CService.class, "ConversationalCComponent"); - service.setConversationID("User provided ID"); - service.getState(); - service.endConversation(); - Assert.assertNull(service.getConversationObjectConversationId()); - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java deleted file mode 100644 index 431962221a..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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.conversational; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.itest.TestResult; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class ConversationUniqueIdTestCase { - - private SCADomain domain; - - @Before - public void setUp() throws Exception { - domain = SCADomain.newInstance("ConversationUniqueId.composite"); - } - - @After - public void tearDown() throws Exception { - if (domain != null) { - domain.close(); - } - } - - @Test - public void testConversationUniqueId() { - Alpha alpha = domain.getService(Alpha.class, "Alpha"); - int numConversations = 3; - - for(int i = 0; i < numConversations; ++i) { - alpha.run(5); - } - - // Wait for the conversations to complete - while (TestResult.getCompleted() < numConversations) { - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - } - } - - Assert.assertEquals(TestResult.results.size(), numConversations); - for(Boolean value : TestResult.results.values()) { - Assert.assertTrue(value); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java deleted file mode 100644 index cc31c77873..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * 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.conversational; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.osoa.sca.ConversationEndedException; - -public class ConversationalAgeTestCase { - - private SCADomain domain; - - @Before - public void setUp() throws Exception { - System.setProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval", "2"); - domain = SCADomain.newInstance("ConversationAge.composite"); - - } - - @After - public void tearDown() throws Exception { - System.clearProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval"); - if (domain != null) { - domain.close(); - } - } - - @Test - public void testMaxAge() throws InterruptedException { - - ConversationalService conversationalService = - domain.getService(ConversationalService.class, "ConversationAgeComponent"); - - Assert.assertEquals(0, conversationalService.retrieveCount()); - conversationalService.initializeCount(42); - Assert.assertEquals(42, conversationalService.retrieveCount()); - Assert.assertEquals(42, conversationalService.retrieveCount()); - Thread.sleep(500); - try { - Assert.assertEquals(42, conversationalService.retrieveCount()); - } catch (ConversationEndedException e) { - Assert.fail(); - } - } - - @Test - public void testAgeExpired() throws InterruptedException { - - ConversationalService conversationalService = - domain.getService(ConversationalService.class, "ConversationAgeComponent"); - - Assert.assertEquals(0, conversationalService.retrieveCount()); - conversationalService.initializeCount(42); - Assert.assertEquals(42, conversationalService.retrieveCount()); - Assert.assertEquals(42, conversationalService.retrieveCount()); - Thread.sleep(1100); - try { - Assert.assertEquals(0, conversationalService.retrieveCount()); - Assert.fail(); - } catch (ConversationEndedException e) { - // expected - } - } - - @Test - public void testMaxIdle() throws InterruptedException { - - ConversationalService conversationalService = - domain.getService(ConversationalService.class, "ConversationIdleComponent"); - - Assert.assertEquals(0, conversationalService.retrieveCount()); - conversationalService.initializeCount(42); - Assert.assertEquals(42, conversationalService.retrieveCount()); - Assert.assertEquals(42, conversationalService.retrieveCount()); - Thread.sleep(1100); - try { - Assert.assertEquals(0, conversationalService.retrieveCount()); - } catch (ConversationEndedException e) { - // expected - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java deleted file mode 100644 index 8480e04028..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * 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.conversational; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -public class ConversationalJ2SETestCase { - - private SCADomain domain; - - @Before - public void setUp() throws Exception { - domain = SCADomain.newInstance("conversational.composite"); - - } - - @After - public void tearDown() throws Exception { - if (domain != null) { - domain.close(); - } - } - - @Test - public void testStatefulConversation() { - ConversationalService conversationalService = - domain.getService(ConversationalService.class, "ConversationalServiceStateful"); - - conversationalService.initializeCount(1); - Assert.assertEquals(1, conversationalService.retrieveCount()); - conversationalService.incrementCount(); - Assert.assertEquals(2, conversationalService.retrieveCount()); - conversationalService.endConversation(); - - Assert.assertEquals(0, conversationalService.retrieveCount()); - - conversationalService.initializeCount(4); - Assert.assertEquals(4, conversationalService.retrieveCount()); - conversationalService.incrementCount(); - Assert.assertEquals(5, conversationalService.retrieveCount()); - conversationalService.endConversation(); - - } - - @Test - public void testStatelessConversation() { - ConversationalService conversationalService = - domain.getService(ConversationalService.class, "ConversationalServiceStateless"); - - conversationalService.initializeCount(1); - Assert.assertEquals(1, conversationalService.retrieveCount()); - conversationalService.incrementCount(); - Assert.assertEquals(2, conversationalService.retrieveCount()); - conversationalService.endConversation(); - - conversationalService.initializeCount(4); - Assert.assertEquals(4, conversationalService.retrieveCount()); - conversationalService.incrementCount(); - Assert.assertEquals(5, conversationalService.retrieveCount()); - conversationalService.endConversation(); - - } -} diff --git a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java deleted file mode 100644 index da359bc296..0000000000 --- a/tags/java/sca/1.5.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java +++ /dev/null @@ -1,649 +0,0 @@ -/* - * 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.conversational; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl; -import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class ConversationalTestCase { - - private static SCADomain domain; - private static ConversationalClient conversationalStatelessClientStatelessService; - private static ConversationalClient conversationalStatelessClientStatefulService; - private static ConversationalClient conversationalStatefulClientStatelessService; - private static ConversationalClient conversationalStatefulClientStatefulService; - private static ConversationalClient conversationalStatelessClientRequestService; - private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; - - @BeforeClass - public static void setUp() throws Exception { - try { - domain = SCADomain.newInstance("conversational.composite"); - - conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class, - "ConversationalStatelessClientStatelessService"); - - conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class, - "ConversationalStatelessClientStatefulService"); - - conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class, - "ConversationalStatefulClientStatelessService"); - - conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class, - "ConversationalStatefulClientStatefulService"); - conversationalStatelessClientRequestService = domain.getService(ConversationalClient.class, - "ConversationalStatelessClientRequestService"); - conversationalStatefulClientNonConversationalCallbackStatelessService = domain.getService(ConversationalClient.class, - "ConversationalStatefulClientNonConversationalCallbackStatefulService"); - - } catch(Exception ex) { - System.err.println(ex.toString()); - } - - } - - @AfterClass - public static void tearDown() throws Exception { - domain.close(); - } - - private void resetCallStack() { - - // reset the place where we record the sequence of calls passing - // through each component instance - ConversationalServiceStatelessImpl.calls = new StringBuffer(); - ConversationalServiceStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - ConversationalClientStatefulImpl.calls = new StringBuffer(); - ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - - } - - // stateless client stateful service tests - // ======================================= - @Test - public void testStatelessStatefulConversationFromInjectedReference() { - int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatefulConversationFromInjectedReference2() { - int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference2(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatefulConversationFromServiceReference() { - int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatefulConversationWithUserDefinedConversationId() { - int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatefulConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatelessStatefulConversationCheckingScope() { - resetCallStack(); - conversationalStatelessClientStatefulService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulImpl.calls.toString()); - } - - @Test - public void testStatelessStatefulConversationWithCallback() { - resetCallStack(); - int count = conversationalStatelessClientStatefulService.runConversationWithCallback(); - Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", - ConversationalClientStatelessImpl.calls.toString()); - } - - //@Test - public void testStatelessStatefulConversationHavingPassedReference() { - int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference(); - Assert.assertEquals(3, count); - } - - @Test - public void testStatelessStatefulConversationBusinessException() { - String message = conversationalStatelessClientStatefulService.runConversationBusinessException(); - Assert.assertEquals("Business Exception", message); - } - - @Test - public void testStatelessStatefulConversationBusinessExceptionCallback() { - String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback(); - Assert.assertEquals("Business Exception", message); - } - - @Test - public void testStatelessStatefulConversationCallingEndedConversation() { - int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatelessStatefulConversationCallingEndedConversationCallback() { - int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatelessStatefulConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - //@Test - public void testStatelessStatefulConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals(null, id); - } - - // stateless client stateless service tests - // ======================================== - @Test - public void testStatelessStatelessConversationFromInjectedReference() { - int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatelessConversationFromInjectedReference2() { - int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference2(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatelessConversationFromServiceReference() { - int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessStatelessConversationWithUserDefinedConversationId() { - int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - @Test - public void testStatelessStatelessConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatelessStatelessConversationCheckingScope() { - resetCallStack(); - conversationalStatelessClientStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalServiceStatelessImpl.calls.toString()); - } - - @Test - public void testStatelessStatelessConversationWithCallback() { - resetCallStack(); - int count = conversationalStatelessClientStatelessService.runConversationWithCallback(); - Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", - ConversationalClientStatelessImpl.calls.toString()); - } - //@Test - public void testStatelessStatelessConversationHavingPassedReference() { - int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference(); - Assert.assertEquals(3, count); - } - - @Test - public void testStatelessStatelessConversationCallingEndedConversation() { - int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation(); - Assert.assertEquals(-999, count); - } - - @Test - public void testStatelessStatelessConversationCallingEndedConversationCallback() { - int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatelessStatelessConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - //@Test - public void testStatelessStatelessConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals(null, id); - } - - // stateful client stateful service tests - // ====================================== - @Test - public void testStatefulStatefulConversationFromInjectedReference() { - int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatefulConversationFromInjectedReference2() { - int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference2(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatefulConversationFromServiceReference() { - int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatefulConversationWithUserDefinedConversationId() { - int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatefulConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatefulStatefulConversationCheckingScope() { - resetCallStack(); - conversationalStatefulClientStatefulService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulImpl.calls.toString()); - } - - @Test - public void testStatefulStatefulConversationWithCallback() { - resetCallStack(); - int count = conversationalStatefulClientStatefulService.runConversationWithCallback(); - Assert.assertEquals(4, count); - - Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalClientStatefulImpl.calls.toString()); - } - - //@Test - public void testStatefulStatefulConversationHavingPassedReference() { - int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference(); - Assert.assertEquals(3, count); - } - - @Test - public void testStatefulStatefulConversationCallingEndedConversation() { - int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulStatefulConversationCallingEndedConversationCallback() { - int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulStatefulConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - @Test - public void testStatefulStatefulConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals(null, id); - } - - // stateful client stateless service tests - // ======================================= - @Test - public void testStatefulStatelessConversationFromInjectedReference() { - int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatelessConversationFromInjectedReference2() { - int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference2(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatelessConversationFromServiceReference() { - int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatelessConversationWithUserDefinedConversationId() { - int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulStatelessConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatefulStatelessConversationCheckingScope() { - resetCallStack(); - conversationalStatefulClientStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalServiceStatelessImpl.calls.toString()); - } - - @Test - public void testStatefulStatelessConversationWithCallback() { - resetCallStack(); - int count = conversationalStatefulClientStatelessService.runConversationWithCallback(); - Assert.assertEquals(4, count); - - Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalClientStatefulImpl.calls.toString()); - } - - //@Test - public void testStatefulStatelessConversationHavingPassedReference() { - int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference(); - Assert.assertEquals(3, count); - } - - @Test - public void testStatefulStatelessConversationCallingEndedConversation() { - int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation(); - Assert.assertEquals(-999, count); - } - - @Test - public void testStatefulStatelessConversationCallingEndedConversationCallback() { - int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulStatelessConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - @Test - public void testStatefulStatelessConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals(null, id); - } - - // stateless client request scope service tests - // ============================================ - @Test - public void testStatelessRequestConversationFromInjectedReference() { - int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessRequestConversationFromInjectedReference2() { - int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference2(); - Assert.assertEquals(1, count); - } - - @Test - public void testStatelessRequestConversationFromServiceReference() { - int count = conversationalStatelessClientRequestService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatelessRequestConversationWithUserDefinedConversationId() { - int count = conversationalStatelessClientRequestService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - - //@Test - public void testStatelessRequestConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatelessRequestConversationCheckingScope() { - resetCallStack(); - ConversationalServiceRequestImpl.calls = new StringBuffer(); - conversationalStatelessClientRequestService.runConversationCheckingScope(); - Assert.assertEquals("initializeCount,incrementCount,retrieveCount,endConversation,", - ConversationalServiceRequestImpl.calls.toString()); - } - - @Test - public void testStatelessRequestConversationWithCallback() { - resetCallStack(); - ConversationalClientStatelessImpl.calls = new StringBuffer(); - int count = conversationalStatelessClientRequestService.runConversationWithCallback(); - Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,", - ConversationalClientStatelessImpl.calls.toString()); - } - - //@Test - public void testStatelessRequestConversationHavingPassedReference() { - int count = conversationalStatelessClientRequestService.runConversationHavingPassedReference(); - Assert.assertEquals(3, count); - } - - @Test - public void testStatelessRequestConversationBusinessException() { - String message = conversationalStatelessClientRequestService.runConversationBusinessException(); - Assert.assertEquals("Business Exception", message); - } - - @Test - public void testStatelessRequestConversationBusinessExceptionCallback() { - String message = conversationalStatelessClientRequestService.runConversationBusinessExceptionCallback(); - Assert.assertEquals("Business Exception", message); - } - - @Test - public void testStatelessRequestConversationCallingEndedConversation() { - int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversation(); - Assert.assertEquals(-999, count); - } - - @Test - public void testStatelessRequestConversationCallingEndedConversationCallback() { - int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatelessRequestConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - //@Test - public void testStatelessRequestConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals(null, id); - } - - // stateful client non conversational callback stateful service tests - // ================================================================== - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference2() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference2(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationFromServiceReference() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationWithUserDefinedConversationId() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithUserDefinedConversationId(); - Assert.assertEquals(2, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationCheckUserDefinedConversationId() { - String conversationId = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckUserDefinedConversationId(); - Assert.assertEquals("MyConversation2", conversationId); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationCheckingScope() { - resetCallStack(); - conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString()); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() { - resetCallStack(); - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithCallback(); - Assert.assertEquals(0, count); - - Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString()); - } - - //@Test - public void testStatefulNonConversationalCallbackStatefulConversationHavingPassedReference() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationHavingPassedReference(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversation() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversation(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallback() { - int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallback(); - Assert.assertEquals(0, count); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCheckConversationId() { - String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCheckConversationId(); - Assert.assertEquals(null, id); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallbackCheckConversationId() { - String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId(); - Assert.assertEquals("MyConversation3", id); - } - - private static final String NEW_A_VALUE = "First Instance - TestCode Set state on A"; - private static final String NEW_B_VALUE = "First Instance - TestCode Set state on B"; - private static final String SECOND_NEW_A_VALUE = "Second Instance - TestCode Set state on A"; - private static final String SECOND_NEW_B_VALUE = "Second Instance - TestCode Set state on B"; - - @Test - public void testMultipleConversations() { - ////////// - // Tests on first instance - ////////// - System.out.println("========= First instance tests ========="); - AService aService = domain.getService(AService.class, "ConversationalAComponent"); - - // Make sure initial values are correct - Assert.assertEquals(Constants.A_INITIAL_VALUE, aService.getState()); - Assert.assertEquals(Constants.B_INITIAL_VALUE, aService.getStateOnB()); - - // Set some new values - aService.setState(NEW_A_VALUE); - aService.setStateOnB(NEW_B_VALUE); - - // Verify the set worked - Assert.assertEquals(NEW_A_VALUE, aService.getState()); - Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB()); - - - ////////// - // Tests on second instance - ////////// - System.out.println("========= Second instance tests ========="); - - // Do another look up - AService aService2 = domain.getService(AService.class, "ConversationalAComponent"); - - // Make sure initial values are correct on the second instance - Assert.assertEquals(Constants.A_INITIAL_VALUE, aService2.getState()); - Assert.assertEquals(Constants.B_INITIAL_VALUE, aService2.getStateOnB()); - - // Set some new values on the second instance - aService2.setState(SECOND_NEW_A_VALUE); - aService2.setStateOnB(SECOND_NEW_B_VALUE); - - // Verify the set worked on the second instance - Assert.assertEquals(SECOND_NEW_A_VALUE, aService2.getState()); - Assert.assertEquals(SECOND_NEW_B_VALUE, aService2.getStateOnB()); - - // Verify the values have not been changed on the first instance - Assert.assertEquals(NEW_A_VALUE, aService.getState()); - Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB()); - - System.out.println("========= Done instance tests ========="); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/pom.xml b/tags/java/sca/1.5.1/itest/corba/pom.xml deleted file mode 100644 index ac07e651b2..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/pom.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - itest-corba-binding - Apache Tuscany SCA iTest CORBA Binding - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-corba-runtime - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-host-corba-jse - 1.5.1 - test - - - - org.apache.tuscany.sca - tuscany-host-corba-jse-tns - 1.5.1 - test - - - - org.apache.tuscany.sca - tuscany-binding-sca - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-binding-sca-corba - 1.5.1 - runtime - - - - - - org.apache.tuscany.sca - tuscany-databinding-axiom - 1.5.1 - runtime - - - - org.apache.tuscany.sca - tuscany-databinding-sdo - 1.5.1 - - - - junit - junit - 4.5 - test - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.0 - - - add-source - generate-sources - - add-test-source - - - - target/sdo-source - - - - - - - org.apache.tuscany.sdo - tuscany-sdo-plugin - 1.1.1 - - - generate-scenariofour-sdo - generate-sources - - - ${basedir}/src/test/resources/scenariofour.xsd - - - org.apache.tuscany.sca.test.corba.scenariofour - - ScenarioFour - true - true - true - - - generate - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java deleted file mode 100644 index 46e214eac3..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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.test.corba; - -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.host.corba.jse.tns.TnsDefaultCorbaHost; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.test.corba.types.ScenarioFive; -import org.apache.tuscany.sca.test.corba.types.ScenarioFiveComponent; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - * Tests usage of TNS JSE Corba host - */ -public class ScenarioFiveTestCase { - - @Test - public void test_providedNameServer() { - TestCorbaHost.setCorbaHost(new TnsDefaultCorbaHost()); - try { - // just make sure we can obtain and use the reference with success - SCADomain domain = SCADomain.newInstance("ScenarioFive.composite"); - ScenarioFive scenarioFive = - domain.getService(ScenarioFiveComponent.class, "ScenarioFive").getScenarioFive(); - scenarioFive.doNothing(); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java deleted file mode 100644 index cba8c823e8..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * 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.test.corba; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourFactory; -import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; -import org.apache.tuscany.sca.test.corba.types.ScenarioFour; -import org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent; -import org.apache.tuscany.sca.test.corba.types.ScenarioFourException; -import org.apache.tuscany.sca.test.corba.types.ScenarioFourStruct; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - * Tests SCA default binding over CORBA binding - */ -public class ScenarioFourTestCase { - - // note that those values are also used in resources/*.composite file - private static SCADomain domain; - private static ScenarioFourComponent scenarioFourComponent; - private static ScenarioFour scenarioFour; - private static TransientNameServer server; - private static final int ORB_INITIAL_PORT = 5080; - - /** - * Initial configuration - */ - @BeforeClass - public static void setUp() { - TestCorbaHost.setCorbaHost(new DefaultCorbaHost()); - try { - server = new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - // obtain domain - domain = SCADomain.newInstance("ScenarioFour.composite"); - scenarioFourComponent = domain.getService(ScenarioFourComponent.class, "ScenarioFour"); - scenarioFour = scenarioFourComponent.getScenarioFour(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Test cleanup - */ - @AfterClass - public static void tearDown() { - server.stop(); - } - - /** - * General tests for passing JAXB objects - */ - @Test - public void test_generalJAXB() { - try { - ScenarioFourStruct input = new ScenarioFourStruct(); - input.field1 = "Test"; - input.field2 = 1; - input.field3 = new double[1]; - ScenarioFourStruct output = scenarioFour.setStruct(input); - assertTrue(input.equals(output)); - } catch (Exception e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - } - - /** - * Test for JAXB exceptions - */ - @Test - public void test_exceptionsJAXB() { - try { - scenarioFour.exceptionTest(); - fail(); - } catch (ScenarioFourException e) { - assertTrue(ScenarioFourException.DEFAULT_CONTENT.equals(e.getContent())); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * General test for passing SDO objects - */ - @Test - public void test_generalSDO() { - try { - ScenarioFourSdo scenarioFourSdo = ScenarioFourFactory.INSTANCE.createScenarioFourSdo(); - scenarioFourSdo.setMessage("Test1"); - scenarioFourSdo.setSymbol("Test2"); - ScenarioFourSdo result = scenarioFour.passScenarioFourStruct(scenarioFourSdo); - assertTrue(scenarioFourSdo.getMessage().equals(result.getMessage()) && scenarioFourSdo.getSymbol() - .equals(result.getSymbol())); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests reusing local name server with multiple bindings - */ - @Test - public void test_nameServerReuse() { - try { - ScenarioFour scenarioFour = - domain.getService(ScenarioFourComponent.class, "ScenarioFourReuse").getScenarioFour(); - ScenarioFourStruct struct = new ScenarioFourStruct(); - scenarioFour.setStruct(struct); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java deleted file mode 100644 index 0135c04495..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java +++ /dev/null @@ -1,371 +0,0 @@ -/* - * 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.test.corba; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.test.corba.generated.Color; -import org.apache.tuscany.sca.test.corba.generated.InnerStruct; -import org.apache.tuscany.sca.test.corba.generated.RichStruct; -import org.apache.tuscany.sca.test.corba.generated.ScenarioOne; -import org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper; -import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations; -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.apache.tuscany.sca.test.corba.types.ScenarioOneServant; -import org.apache.tuscany.sca.test.corba.types.TColor; -import org.apache.tuscany.sca.test.corba.types.TInnerStruct; -import org.apache.tuscany.sca.test.corba.types.TRichStruct; -import org.apache.tuscany.sca.test.corba.types.TScenarioOne; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.omg.CORBA.ORB; -import org.omg.CosNaming.NameComponent; -import org.omg.CosNaming.NamingContext; -import org.omg.CosNaming.NamingContextHelper; - -/** - * @version $Rev$ $Date$ - * This test class contains three main tests:
- * 1. Tuscany is being used as a consumer of some non-Tuscany CORBA service
- * 2. Tuscany is being used as a service provider, which will be consumed by - * non-Tuscany CORBA client
- * 3. Tuscany is being used as a service provider, which will be consumed by - * Tuscany client
- * But that's not all, there are some other variations. Tuscany CORBA binding - * supports using Java interface generated by IDLJ, also it supports interfaces - * provided by user - I combined those cases in each test.
- */ -public class ScenarioOneTestCase { - - // note that those values are also used in resources/*.composite file - private static int ORB_INITIAL_PORT = 5060; - private static String SERVICE_NAME = "ScenarioOne"; - - private static SCADomain domain; - - private static TransientNameServer server; - private static ORB orb; - - /** - * Sets up name service, creates and registers traditional CORBA service, - * obtains SCADomain - */ - @BeforeClass - public static void setUp() { - TestCorbaHost.setCorbaHost(new DefaultCorbaHost()); - try { - try { - server = - new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - orb = server.getORB(); - } catch (Throwable e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioOne scenarioOne = new ScenarioOneServant(); - ncRef.rebind(path, scenarioOne); - // obtain domain - domain = SCADomain.newInstance("ScenarioOne.composite"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Kills previously spawned name service. - */ - @AfterClass - public static void tearDown() { - server.stop(); - } - - /** - * Creates nicely filled structure for user provided interface. - * - * @return - */ - private static TRichStruct getTRichStruct() { - int[][] intArr = new int[][] { {1, 2}, {3, 4}}; - TInnerStruct innerStruct = new TInnerStruct(intArr, "Test", TColor.green); - String[] strSeq = {"i", "Test"}; - return new TRichStruct(innerStruct, strSeq, 1); - - } - - /** - * Creates nicely filled structure for generated interface. - * - * @return - */ - private static RichStruct getRichStruct() { - int[][] intArr = new int[][] { {1, 2}, {3, 4}}; - InnerStruct innerStruct2 = new InnerStruct(intArr, "Test", Color.green); - String[] strSeq = {"i", "Test"}; - return new RichStruct(innerStruct2, strSeq, 1); - } - - /** - * Compares String arrays - * - * @param arg1 - * @param arg2 - * @return - */ - private boolean areSrringArraysEqual(String[] arg1, String[] arg2) { - try { - for (int i = 0; i < arg1.length; i++) { - if (!arg1[i].equals(arg2[i])) { - return false; - } - } - } catch (Exception e) { - return false; - } - return true; - } - - /** - * Compares two dimensional int arrays - * - * @param arg1 - * @param arg2 - * @return - */ - private boolean areTwoDimIntArraysEqual(int[][] arg1, int[][] arg2) { - try { - for (int i = 0; i < arg1.length; i++) { - for (int j = 0; j < arg1[i].length; j++) { - if (arg1[i][j] != arg2[i][j]) { - return false; - } - } - } - } catch (Exception e) { - return false; - } - return true; - } - - private boolean equalTo(TInnerStruct arg1, TInnerStruct arg2) { - return (arg1.color.value() == arg2.color.value() && arg1.stringField.equals(arg2.stringField) && areTwoDimIntArraysEqual(arg1.twoDimLongSequence, - arg2.twoDimLongSequence)); - } - - private boolean equalTo(InnerStruct arg1, InnerStruct arg2) { - return (arg1.color.value() == arg2.color.value() && arg1.stringField.equals(arg2.stringField) && areTwoDimIntArraysEqual(arg1.twoDimLongSequence, - arg2.twoDimLongSequence)); - } - - private boolean equalTo(TRichStruct arg1, TRichStruct arg2) { - return (equalTo(arg1.innerStruct, arg2.innerStruct) && arg2.longField == arg1.longField && areSrringArraysEqual(arg1.stringSequence, - arg2.stringSequence)); - } - - private boolean equalTo(RichStruct arg1, RichStruct arg2) { - return (equalTo(arg1.innerStruct, arg2.innerStruct) && arg2.longField == arg1.longField && areSrringArraysEqual(arg1.stringSequence, - arg2.stringSequence)); - } - - /** - * Helper method used several times for various components. Executes several - * tests using Tuscany reference binding. This helper uses generated Java - * interface. - * - * @param componentName - */ - private void testClientUsingGeneratedInterface(String componentName) { - ScenarioOneOperations component = domain.getService(ScenarioOneOperations.class, componentName); - RichStruct richStruct = getRichStruct(); - - try { - RichStruct result = component.setRichStruct(richStruct); - assertTrue(equalTo(result, richStruct)); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - - try { - richStruct.longField = 0; - component.setRichStruct(richStruct); - fail(); - } catch (Exception e) { - assertTrue(e instanceof UnexpectedException); - } - - try { - richStruct.longField = 1; - richStruct.innerStruct.color = Color.red; - component.setRichStruct(richStruct); - } catch (Exception e) { - assertTrue(e instanceof WrongColor); - } - } - - /** - * Helper method used several times for various components. Executes several - * tests using Tuscany reference binding. This helper uses user provided - * Java interface. - * - * @param componentName - */ - private void testClientUsingUserProvidedInterface(String componentName) { - TScenarioOne component = domain.getService(TScenarioOne.class, componentName); - TRichStruct tRichStruct = getTRichStruct(); - - try { - TRichStruct result = component.setRichStruct(tRichStruct); - assertTrue(equalTo(result, tRichStruct)); - } catch (Exception e) { - fail(); - } - - try { - tRichStruct.longField = 0; - component.setRichStruct(tRichStruct); - fail(); - } catch (Exception e) { - assertTrue(e instanceof UnexpectedException); - } - - try { - tRichStruct.longField = 1; - tRichStruct.innerStruct.color = TColor.red; - component.setRichStruct(tRichStruct); - } catch (Exception e) { - assertTrue(e instanceof WrongColor); - } - } - - public void testServiceUsingGeneratedClient(String serviceName) { - try { - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(serviceName, ""); - NameComponent path[] = {nc}; - ScenarioOne so = ScenarioOneHelper.narrow(ncRef.resolve(path)); - - RichStruct richStruct = getRichStruct(); - RichStruct result = so.setRichStruct(richStruct); - assertTrue(equalTo(result, richStruct)); - - try { - richStruct.innerStruct.color = Color.red; - result = so.setRichStruct(richStruct); - fail(); - } catch (Exception e) { - assertTrue(e instanceof WrongColor); - } - - try { - richStruct.innerStruct.color = Color.green; - richStruct.longField = 0; - result = so.setRichStruct(richStruct); - fail(); - } catch (Exception e) { - assertTrue(e instanceof UnexpectedException); - } - - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Service is exposed in traditional way (using CORBA API from JDK). - * Reference is obtained from Tuscany. - */ - @Test - public void test_TraditionalService_TuscanyClient() { - - // Client is using user provided interface - testClientUsingUserProvidedInterface("ScenarioOne"); - - // Client is using generated interface - testClientUsingGeneratedInterface("ScenarioOneGenerated"); - } - - /** - * Service is exposed by Tuscany. Reference is obtained in traditional way. - * (using CORBA API from JDK) - * - * @throws Exception - */ - @Test - public void test_TuscanyService_TraditionalClient() throws Exception { - - // tests service which uses user provided interface - testServiceUsingGeneratedClient("ScenarioOneTuscany"); - - // tests service which uses generated interface - testServiceUsingGeneratedClient("ScenarioOneTuscanyGenerated"); - } - - /** - * Service is exposed by Tuscany. Reference is obtained from Tuscany. There - * are 4 combinations (basing on if we are using generated or user provided - * interfaces, both on service and reference side). - */ - @Test - public void test_TuscanyService_TuscanyClient() { - - // Client is using user provided interface, service is using user - // provided interface. - testClientUsingUserProvidedInterface("TU2TS1"); - - // Client is using user provided interface, service is using generated - // interface. - testClientUsingUserProvidedInterface("TU2TS2"); - - // Client is using generated interface, service is using user provided - // interface. - testClientUsingGeneratedInterface("TG2TS1"); - - // Client is using generated interface, service is using generated - // interface. - testClientUsingGeneratedInterface("TG2TS2"); - } - - /** - * Tests using reference obtained by corbaname URI - */ - @Test - public void test_serviceAndReferenceByURI() { - testClientUsingUserProvidedInterface("UriBinding"); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java deleted file mode 100644 index b7309d68a0..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java +++ /dev/null @@ -1,228 +0,0 @@ -/* - * 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.test.corba; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct; -import org.apache.tuscany.sca.test.corba.generated.InnerUnion; -import org.apache.tuscany.sca.test.corba.generated.RichUnion; -import org.apache.tuscany.sca.test.corba.generated.ScenarioSix; -import org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper; -import org.apache.tuscany.sca.test.corba.types.ScenarioSixServant; -import org.apache.tuscany.sca.test.corba.types.TAnnotatedStruct; -import org.apache.tuscany.sca.test.corba.types.TInnerUnion; -import org.apache.tuscany.sca.test.corba.types.TRichUnion; -import org.apache.tuscany.sca.test.corba.types.TScenarioSix; -import org.apache.tuscany.sca.test.corba.types.TScenarioSixComponent; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.omg.CORBA.ORB; -import org.omg.CosNaming.NameComponent; -import org.omg.CosNaming.NamingContext; -import org.omg.CosNaming.NamingContextHelper; - -/** - * Tests using enhanced Java interfaces (annotations) - * - * @version $Rev$ $Date$ - */ -public class ScenarioSixTestCase { - - // note that those values are also used in resources/*.composite file - private static int ORB_INITIAL_PORT = 5050; - private static String SERVICE_NAME = "ScenarioSix"; - private static String TUSCANY_SERVICE_NAME = "ScenarioSixTuscany"; - - private static SCADomain domain; - - private static TransientNameServer server; - private static ORB orb; - - /** - * Sets up name service, creates and registers traditional CORBA service, - * obtains SCADomain - */ - @BeforeClass - public static void setUp() { - TestCorbaHost.setCorbaHost(new DefaultCorbaHost()); - try { - try { - server = - new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - orb = server.getORB(); - } catch (Throwable e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioSix scenarioSix = new ScenarioSixServant(); - ncRef.rebind(path, scenarioSix); - // obtain domain - domain = SCADomain.newInstance("ScenarioSix.composite"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Kills previously spawned name service. - */ - @AfterClass - public static void tearDown() { - server.stop(); - } - - private boolean areArraysEqual(String[][] arr1, String[][] arr2) { - for (int i = 0; i < arr1.length; i++) { - for (int j = 0; j < arr1[i].length; j++) { - if (!arr1[i][j].equals(arr2[i][j])) { - return false; - } - } - } - return true; - } - - private String[][] getStringArray() { - String[][] result = { {"Hello", "World"}, {"Hi", "Again"}}; - return result; - } - - /** - * Tests passing arrays. Tuscany acts as a client, servant object is served - * in a traditional way - */ - @Test - public void test_arraysPassing_tuscanyAsClient() { - try { - TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix(); - String[][] arrayArg = getStringArray(); - String[][] arrayRes = ref.passStringArray(arrayArg); - assertTrue(areArraysEqual(arrayArg, arrayRes)); - TAnnotatedStruct structArg = new TAnnotatedStruct(); - structArg.stringArray = getStringArray(); - TAnnotatedStruct structRes = ref.passAnnotatedStruct(structArg); - assertTrue(areArraysEqual(structArg.stringArray, structRes.stringArray)); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests passing arrays. Servant object is served by Tuscany and it is - * accessed by traditional Corba client - */ - @Test - public void test_arraysPassing_tuscanyAsService() { - try { - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioSix ref = ScenarioSixHelper.narrow(ncRef.resolve(path)); - String[][] stringArg = getStringArray(); - String[][] stringRes = ref.passStringArray(stringArg); - assertTrue(areArraysEqual(stringArg, stringRes)); - AnnotatedStruct structArg = new AnnotatedStruct(); - structArg.stringArray = getStringArray(); - AnnotatedStruct structRes = ref.passAnnotatedStruct(structArg); - assertTrue(areArraysEqual(structArg.stringArray, structRes.stringArray)); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests passing unions. Tuscany acts as a client, servant object is served - * in a traditional way - */ - @Test - public void test_unionsPassing_tuscanyAsClient() { - try { - TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix(); - TRichUnion arg = new TRichUnion(); - TInnerUnion inner = new TInnerUnion(); - inner.setY(10f); - arg.setIu(inner); - TRichUnion result = ref.passRichUnion(arg); - assertEquals(arg.getIu().getY(), result.getIu().getY(), 0.0f); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - try { - TScenarioSix ref = domain.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix(); - TRichUnion arg = new TRichUnion(); - arg.setY(15f); - TRichUnion result = ref.passRichUnion(arg); - assertEquals(arg.getY(), result.getY(), 0.0f); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests passing unions. Servant object is served by Tuscany and it is - * accessed by traditional Corba client - */ - @Test - public void test_unionsPassing_tuscanyAsService() { - try { - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioSix ref = ScenarioSixHelper.narrow(ncRef.resolve(path)); - RichUnion arg = new RichUnion(); - InnerUnion inner = new InnerUnion(); - inner.y(20f); - arg.iu(inner); - RichUnion result = ref.passRichUnion(arg); - assertEquals(arg.iu().y(), result.iu().y(), 0.0f); - arg = new RichUnion(); - arg.y(15f); - result = ref.passRichUnion(arg); - assertEquals(arg.y(), result.y(), 0.0f); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java deleted file mode 100644 index a738c6f211..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * 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.test.corba; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.test.corba.types.TScenarioThree; -import org.apache.tuscany.sca.test.corba.types.TScenarioThreeComponent; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - * Tests various mapping scenarios. - */ -public class ScenarioThreeTestCase { - - // note that those values are also used in resources/*.composite file - private static int ORB_INITIAL_PORT = 5060; - private static SCADomain domain; - private static TransientNameServer server; - - /** - * Sets up name service, creates and registers traditional CORBA service, - * obtains SCADomain - */ - @BeforeClass - public static void setUp() { - TestCorbaHost.setCorbaHost(new DefaultCorbaHost()); - try { - try { - server = - new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - } catch (Throwable e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - // obtain domain - domain = SCADomain.newInstance("ScenarioThree.composite"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Kills previously spawned name service. - */ - @AfterClass - public static void tearDown() { - server.stop(); - } - - /** - * Tests mapping for getters and setters - */ - @Test - public void test_getterSetter() { - try { - TScenarioThree ref = - domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree(); - ref.getIntField(); - ref.setIntField(1); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests mapping the same operation names but with different cases - */ - @Test - public void test_nameCase() { - try { - TScenarioThree ref = - domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree(); - assertEquals(0, ref.caseDifferent()); - assertEquals(1, ref.CaseDifferent()); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests mappings for operations with overloaded names - */ - @Test - public void test_overloadedNames() { - try { - TScenarioThree ref = - domain.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree(); - ref.overloadedName(); - ref.overloadedName(""); - ref.overloadedName("", 0); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java deleted file mode 100644 index 008212bdbe..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * 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.test.corba; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.test.corba.generated.ScenarioTwo; -import org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper; -import org.apache.tuscany.sca.test.corba.types.ScenarioTwoServant; -import org.apache.tuscany.sca.test.corba.types.TScenarioTwo; -import org.apache.tuscany.sca.test.corba.types.TScenarioTwoComponent; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.omg.CORBA.ORB; -import org.omg.CosNaming.NameComponent; -import org.omg.CosNaming.NamingContext; -import org.omg.CosNaming.NamingContextHelper; - -/** - * @version $Rev$ $Date$ - * Tests attribute get/set mapping using cooperation between traditional CORBA - * and Tuscany CORBA - */ -public class ScenarioTwoTestCase { - - // note that those values are also used in resources/*.composite file - private static int ORB_INITIAL_PORT = 5060; - - private static SCADomain domain; - - private static TransientNameServer server; - private static ORB orb; - private static String TUSCANY_SERVICE_NAME = "ScenarioTwo"; - private static String GENERATED_SERVICE_NAME = "ScenarioTwoGenerated"; - - /** - * Sets up name service, creates and registers traditional CORBA service, - * obtains SCADomain - */ - @BeforeClass - public static void setUp() { - TestCorbaHost.setCorbaHost(new DefaultCorbaHost()); - try { - try { - server = - new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - orb = server.getORB(); - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(GENERATED_SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioTwo scenarioTwo = new ScenarioTwoServant(); - ncRef.rebind(path, scenarioTwo); - } catch (Throwable e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - // obtain domain - domain = SCADomain.newInstance("ScenarioTwo.composite"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Kills previously spawned name service. - */ - @AfterClass - public static void tearDown() { - server.stop(); - } - - /** - * Tests using objects attribute (which is server in traditional way) by - * Tuscany CORBA binding - */ - @Test - public void test_tuscanyGetSetAttribute() { - try { - TScenarioTwo ref = domain.getService(TScenarioTwoComponent.class, "ScenarioTwo").getScenarioTwo(); - String strVal = "Whatever"; - ref.setStringField(strVal); - assertEquals(strVal, ref.getStringField()); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests using objects attribute (which is served by Tuscany) in traditional - * way (by idlj generated code) - */ - @Test - public void test_getneratedGetSetAttribute() { - try { - orb = server.getORB(); - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioTwo st = ScenarioTwoHelper.narrow(ncRef.resolve(path)); - st.stringField(""); - assertEquals("", st.stringField()); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java deleted file mode 100644 index bd1ce8cb49..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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.test.corba; - -import org.apache.tuscany.sca.host.corba.CorbaHost; -import org.apache.tuscany.sca.host.corba.CorbaHostException; -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.omg.CORBA.Object; - -/** - * @version $Rev$ $Date$ - * Mock Corba host which proxies to configured Corba host - */ -public class TestCorbaHost implements CorbaHost { - - private static CorbaHost corbaHost = new DefaultCorbaHost(); - - /** - * Configures environment to use given Corba host - * - * @param corbaHost Corba host to use - */ - public static void setCorbaHost(CorbaHost corbaHost) { - TestCorbaHost.corbaHost = corbaHost; - } - - public Object lookup(String arg0) throws CorbaHostException { - return TestCorbaHost.corbaHost.lookup(arg0); - } - - public void registerServant(String arg0, Object arg1) throws CorbaHostException { - TestCorbaHost.corbaHost.registerServant(arg0, arg1); - } - - public void unregisterServant(String arg0) throws CorbaHostException { - TestCorbaHost.corbaHost.unregisterServant(arg0); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java deleted file mode 100644 index c25372c837..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.test.corba; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.ModuleActivator; -import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint; - -/** - * @version $Rev$ $Date$ - * Registers TestCorbaHost as a Corba host extension. - */ -public class TestCorbaHostModuleActivator implements ModuleActivator { - - public void start(ExtensionPointRegistry extensionPointRegistry) { - CorbaHostExtensionPoint chep = extensionPointRegistry.getExtensionPoint(CorbaHostExtensionPoint.class); - chep.getCorbaHosts().add(0, new TestCorbaHost()); - } - - public void stop(ExtensionPointRegistry extensionPointRegistry) { - - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java deleted file mode 100644 index 82b327f11c..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpie 2008 15:31:35 CEST -*/ - -public final class AnnotatedStruct implements org.omg.CORBA.portable.IDLEntity -{ - public String stringArray[][] = null; - - public AnnotatedStruct () - { - } // ctor - - public AnnotatedStruct (String[][] _stringArray) - { - stringArray = _stringArray; - } // ctor - -} // class AnnotatedStruct diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java deleted file mode 100644 index 010dea1e1a..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpie 2008 15:31:35 CEST -*/ - -abstract public class AnnotatedStructHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct/AnnotatedStruct:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - private static boolean __active = false; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - synchronized (org.omg.CORBA.TypeCode.class) - { - if (__typeCode == null) - { - if (__active) - { - return org.omg.CORBA.ORB.init().create_recursive_tc ( _id ); - } - __active = true; - org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 ); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 ); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.id (), "StringArray", _tcOf_members0); - _members0[0] = new org.omg.CORBA.StructMember ( - "stringArray", - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.id (), "AnnotatedStruct", _members0); - __active = false; - } - } - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value = new org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct (); - value.stringArray = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (istream); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value) - { - org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (ostream, value.stringArray); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java deleted file mode 100644 index 67acde6682..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpie 2008 15:31:35 CEST -*/ - -public final class AnnotatedStructHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value = null; - - public AnnotatedStructHolder () - { - } - - public AnnotatedStructHolder (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java deleted file mode 100644 index 1a2c30ee62..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/Color.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public class Color implements org.omg.CORBA.portable.IDLEntity -{ - private int __value; - private static int __size = 3; - private static org.apache.tuscany.sca.test.corba.generated.Color[] __array = new org.apache.tuscany.sca.test.corba.generated.Color [__size]; - - public static final int _red = 0; - public static final org.apache.tuscany.sca.test.corba.generated.Color red = new org.apache.tuscany.sca.test.corba.generated.Color(_red); - public static final int _yellow = 1; - public static final org.apache.tuscany.sca.test.corba.generated.Color yellow = new org.apache.tuscany.sca.test.corba.generated.Color(_yellow); - public static final int _green = 2; - public static final org.apache.tuscany.sca.test.corba.generated.Color green = new org.apache.tuscany.sca.test.corba.generated.Color(_green); - - public int value () - { - return __value; - } - - public static org.apache.tuscany.sca.test.corba.generated.Color from_int (int value) - { - if (value >= 0 && value < __size) - return __array[value]; - else - throw new org.omg.CORBA.BAD_PARAM (); - } - - protected Color (int value) - { - __value = value; - __array[__value] = this; - } -} // class Color diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java deleted file mode 100644 index 7f358936fa..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ColorHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class ColorHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/Color:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.Color that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.Color extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_enum_tc (org.apache.tuscany.sca.test.corba.generated.ColorHelper.id (), "Color", new String[] { "red", "yellow", "green"} ); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.Color read (org.omg.CORBA.portable.InputStream istream) - { - return org.apache.tuscany.sca.test.corba.generated.Color.from_int (istream.read_long ()); - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.Color value) - { - ostream.write_long (value.value ()); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java deleted file mode 100644 index b07e193995..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/ColorHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class ColorHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.Color value = null; - - public ColorHolder () - { - } - - public ColorHolder (org.apache.tuscany.sca.test.corba.generated.Color initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.ColorHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java deleted file mode 100644 index 1c1cd31dc1..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerStruct.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class InnerStruct implements org.omg.CORBA.portable.IDLEntity -{ - public int twoDimLongSequence[][] = null; - public String stringField = null; - public org.apache.tuscany.sca.test.corba.generated.Color color = null; - - public InnerStruct () - { - } // ctor - - public InnerStruct (int[][] _twoDimLongSequence, String _stringField, org.apache.tuscany.sca.test.corba.generated.Color _color) - { - twoDimLongSequence = _twoDimLongSequence; - stringField = _stringField; - color = _color; - } // ctor - -} // class InnerStruct diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java deleted file mode 100644 index 565557db2d..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class InnerStructHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/InnerStruct/InnerStruct:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.InnerStruct that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.InnerStruct extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - private static boolean __active = false; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - synchronized (org.omg.CORBA.TypeCode.class) - { - if (__typeCode == null) - { - if (__active) - { - return org.omg.CORBA.ORB.init().create_recursive_tc ( _id ); - } - __active = true; - org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", _tcOf_members0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.id (), "TwoDimLongSequence", _tcOf_members0); - _members0[0] = new org.omg.CORBA.StructMember ( - "twoDimLongSequence", - _tcOf_members0, - null); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); - _members0[1] = new org.omg.CORBA.StructMember ( - "stringField", - _tcOf_members0, - null); - _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type (); - _members0[2] = new org.omg.CORBA.StructMember ( - "color", - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.id (), "InnerStruct", _members0); - __active = false; - } - } - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.InnerStruct read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.InnerStruct value = new org.apache.tuscany.sca.test.corba.generated.InnerStruct (); - value.twoDimLongSequence = org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.read (istream); - value.stringField = istream.read_string (); - value.color = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.InnerStruct value) - { - org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.write (ostream, value.twoDimLongSequence); - ostream.write_string (value.stringField); - org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.color); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java deleted file mode 100644 index 6e581e5215..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class InnerStructHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.InnerStruct value = null; - - public InnerStructHolder () - { - } - - public InnerStructHolder (org.apache.tuscany.sca.test.corba.generated.InnerStruct initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java deleted file mode 100644 index 9c088b8bb9..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerUnion.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpie 2008 19:07:14 CEST -*/ - -public final class InnerUnion implements org.omg.CORBA.portable.IDLEntity -{ - private int ___x; - private float ___y; - private int __discriminator; - private boolean __uninitialized = true; - - public InnerUnion () - { - } - - public int discriminator () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - return __discriminator; - } - - public int x () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyx (__discriminator); - return ___x; - } - - public void x (int value) - { - __discriminator = 1; - ___x = value; - __uninitialized = false; - } - - public void x (int discriminator, int value) - { - verifyx (discriminator); - __discriminator = discriminator; - ___x = value; - __uninitialized = false; - } - - private void verifyx (int discriminator) - { - if (discriminator != 1) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public float y () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyy (__discriminator); - return ___y; - } - - public void y (float value) - { - __discriminator = 2; - ___y = value; - __uninitialized = false; - } - - public void y (int discriminator, float value) - { - verifyy (discriminator); - __discriminator = discriminator; - ___y = value; - __uninitialized = false; - } - - private void verifyy (int discriminator) - { - if (discriminator != 2) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public void _default () - { - __discriminator = -2147483648; - __uninitialized = false; - } - - public void _default (int discriminator) - { - verifyDefault( discriminator ) ; - __discriminator = discriminator ; - __uninitialized = false; - } - - private void verifyDefault( int value ) - { - switch (value) { - case 1: - case 2: - throw new org.omg.CORBA.BAD_OPERATION() ; - - default: - return; - } - } - -} // class InnerUnion diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java deleted file mode 100644 index 50069d7ac8..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpie 2008 19:07:14 CEST -*/ - -abstract public class InnerUnionHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/InnerUnion/InnerUnion:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.InnerUnion that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.InnerUnion extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - org.omg.CORBA.TypeCode _disTypeCode0; - _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [2]; - org.omg.CORBA.TypeCode _tcOf_members0; - org.omg.CORBA.Any _anyOf_members0; - - // Branch for x (case label 1) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)1); - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - _members0[0] = new org.omg.CORBA.UnionMember ( - "x", - _anyOf_members0, - _tcOf_members0, - null); - - // Branch for y (case label 2) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)2); - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float); - _members0[1] = new org.omg.CORBA.UnionMember ( - "y", - _anyOf_members0, - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.id (), "InnerUnion", _disTypeCode0, _members0); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.InnerUnion read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.InnerUnion value = new org.apache.tuscany.sca.test.corba.generated.InnerUnion (); - int _dis0 = (int)0; - _dis0 = istream.read_long (); - switch (_dis0) - { - case 1: - int _x = (int)0; - _x = istream.read_long (); - value.x (_x); - break; - case 2: - float _y = (float)0; - _y = istream.read_float (); - value.y (_y); - break; - default: - value._default( _dis0 ) ; - break; - } - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.InnerUnion value) - { - ostream.write_long (value.discriminator ()); - switch (value.discriminator ()) - { - case 1: - ostream.write_long (value.x ()); - break; - case 2: - ostream.write_float (value.y ()); - break; - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java deleted file mode 100644 index e63120a083..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpie 2008 19:07:14 CEST -*/ - -public final class InnerUnionHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.InnerUnion value = null; - - public InnerUnionHolder () - { - } - - public InnerUnionHolder (org.apache.tuscany.sca.test.corba.generated.InnerUnion initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java deleted file mode 100644 index b8e3e16a31..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class LongSequenceHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/LongSequence:1.0"; - - public static void insert (org.omg.CORBA.Any a, int[] that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static int[] extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode); - __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", __typeCode); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static int[] read (org.omg.CORBA.portable.InputStream istream) - { - int value[] = null; - int _len0 = istream.read_long (); - value = new int[_len0]; - istream.read_long_array (value, 0, _len0); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, int[] value) - { - ostream.write_long (value.length); - ostream.write_long_array (value, 0, value.length); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java deleted file mode 100644 index 292c3af11b..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class LongSequenceHolder implements org.omg.CORBA.portable.Streamable -{ - public int value[] = null; - - public LongSequenceHolder () - { - } - - public LongSequenceHolder (int[] initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java deleted file mode 100644 index 8a6047c92e..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/RichStruct.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class RichStruct implements org.omg.CORBA.portable.IDLEntity -{ - public org.apache.tuscany.sca.test.corba.generated.InnerStruct innerStruct = null; - public String stringSequence[] = null; - public int longField = (int)0; - - public RichStruct () - { - } // ctor - - public RichStruct (org.apache.tuscany.sca.test.corba.generated.InnerStruct _innerStruct, String[] _stringSequence, int _longField) - { - innerStruct = _innerStruct; - stringSequence = _stringSequence; - longField = _longField; - } // ctor - -} // class RichStruct diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java deleted file mode 100644 index d9fcc63371..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class RichStructHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/RichStruct/RichStruct:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.RichStruct that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.RichStruct extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - private static boolean __active = false; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - synchronized (org.omg.CORBA.TypeCode.class) - { - if (__typeCode == null) - { - if (__active) - { - return org.omg.CORBA.ORB.init().create_recursive_tc ( _id ); - } - __active = true; - org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.type (); - _members0[0] = new org.omg.CORBA.StructMember ( - "innerStruct", - _tcOf_members0, - null); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.id (), "StringSequence", _tcOf_members0); - _members0[1] = new org.omg.CORBA.StructMember ( - "stringSequence", - _tcOf_members0, - null); - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - _members0[2] = new org.omg.CORBA.StructMember ( - "longField", - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.RichStructHelper.id (), "RichStruct", _members0); - __active = false; - } - } - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.RichStruct read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.RichStruct value = new org.apache.tuscany.sca.test.corba.generated.RichStruct (); - value.innerStruct = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.read (istream); - value.stringSequence = org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.read (istream); - value.longField = istream.read_long (); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.RichStruct value) - { - org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.write (ostream, value.innerStruct); - org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.write (ostream, value.stringSequence); - ostream.write_long (value.longField); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java deleted file mode 100644 index a3f2c8314e..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class RichStructHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.RichStruct value = null; - - public RichStructHolder () - { - } - - public RichStructHolder (org.apache.tuscany.sca.test.corba.generated.RichStruct initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.RichStructHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java deleted file mode 100644 index 2c49fac39f..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/RichUnion.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpie 2008 19:07:14 CEST -*/ - -public final class RichUnion implements org.omg.CORBA.portable.IDLEntity -{ - private int ___x; - private float ___y; - private String ___z; - private org.apache.tuscany.sca.test.corba.generated.InnerUnion ___iu; - private boolean ___a; - private int __discriminator; - private boolean __uninitialized = true; - - public RichUnion () - { - } - - public int discriminator () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - return __discriminator; - } - - public int x () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyx (__discriminator); - return ___x; - } - - public void x (int value) - { - __discriminator = 1; - ___x = value; - __uninitialized = false; - } - - public void x (int discriminator, int value) - { - verifyx (discriminator); - __discriminator = discriminator; - ___x = value; - __uninitialized = false; - } - - private void verifyx (int discriminator) - { - if (discriminator != 1) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public float y () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyy (__discriminator); - return ___y; - } - - public void y (float value) - { - __discriminator = 2; - ___y = value; - __uninitialized = false; - } - - public void y (int discriminator, float value) - { - verifyy (discriminator); - __discriminator = discriminator; - ___y = value; - __uninitialized = false; - } - - private void verifyy (int discriminator) - { - if (discriminator != 2) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public String z () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyz (__discriminator); - return ___z; - } - - public void z (String value) - { - __discriminator = 3; - ___z = value; - __uninitialized = false; - } - - public void z (int discriminator, String value) - { - verifyz (discriminator); - __discriminator = discriminator; - ___z = value; - __uninitialized = false; - } - - private void verifyz (int discriminator) - { - if (discriminator != 3) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public org.apache.tuscany.sca.test.corba.generated.InnerUnion iu () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyiu (__discriminator); - return ___iu; - } - - public void iu (org.apache.tuscany.sca.test.corba.generated.InnerUnion value) - { - __discriminator = 4; - ___iu = value; - __uninitialized = false; - } - - public void iu (int discriminator, org.apache.tuscany.sca.test.corba.generated.InnerUnion value) - { - verifyiu (discriminator); - __discriminator = discriminator; - ___iu = value; - __uninitialized = false; - } - - private void verifyiu (int discriminator) - { - if (discriminator != 4) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public boolean a () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifya (__discriminator); - return ___a; - } - - public void a (boolean value) - { - __discriminator = -2147483648; - ___a = value; - __uninitialized = false; - } - - public void a (int discriminator, boolean value) - { - verifya (discriminator); - __discriminator = discriminator; - ___a = value; - __uninitialized = false; - } - - private void verifya (int discriminator) - { - if (discriminator == 1 || discriminator == 2 || discriminator == 3 || discriminator == 4) - throw new org.omg.CORBA.BAD_OPERATION (); - } - -} // class RichUnion diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java deleted file mode 100644 index 5b1b710919..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpie 2008 19:07:14 CEST -*/ - -abstract public class RichUnionHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/RichUnion/RichUnion:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.RichUnion that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.RichUnion extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - org.omg.CORBA.TypeCode _disTypeCode0; - _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [5]; - org.omg.CORBA.TypeCode _tcOf_members0; - org.omg.CORBA.Any _anyOf_members0; - - // Branch for x (case label 1) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)1); - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - _members0[0] = new org.omg.CORBA.UnionMember ( - "x", - _anyOf_members0, - _tcOf_members0, - null); - - // Branch for y (case label 2) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)2); - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float); - _members0[1] = new org.omg.CORBA.UnionMember ( - "y", - _anyOf_members0, - _tcOf_members0, - null); - - // Branch for z (case label 3) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)3); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); - _members0[2] = new org.omg.CORBA.UnionMember ( - "z", - _anyOf_members0, - _tcOf_members0, - null); - - // Branch for iu (case label 4) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)4); - _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.type (); - _members0[3] = new org.omg.CORBA.UnionMember ( - "iu", - _anyOf_members0, - _tcOf_members0, - null); - - // Branch for a (Default case) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_octet ((byte)0); // default member label - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_boolean); - _members0[4] = new org.omg.CORBA.UnionMember ( - "a", - _anyOf_members0, - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.id (), "RichUnion", _disTypeCode0, _members0); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.RichUnion read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.RichUnion value = new org.apache.tuscany.sca.test.corba.generated.RichUnion (); - int _dis0 = (int)0; - _dis0 = istream.read_long (); - switch (_dis0) - { - case 1: - int _x = (int)0; - _x = istream.read_long (); - value.x (_x); - break; - case 2: - float _y = (float)0; - _y = istream.read_float (); - value.y (_y); - break; - case 3: - String _z = null; - _z = istream.read_string (); - value.z (_z); - break; - case 4: - org.apache.tuscany.sca.test.corba.generated.InnerUnion _iu = null; - _iu = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.read (istream); - value.iu (_iu); - break; - default: - boolean _a = false; - _a = istream.read_boolean (); - value.a (_dis0, _a); - break; - } - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.RichUnion value) - { - ostream.write_long (value.discriminator ()); - switch (value.discriminator ()) - { - case 1: - ostream.write_long (value.x ()); - break; - case 2: - ostream.write_float (value.y ()); - break; - case 3: - ostream.write_string (value.z ()); - break; - case 4: - org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.write (ostream, value.iu ()); - break; - default: - ostream.write_boolean (value.a ()); - break; - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java deleted file mode 100644 index 3bf646a485..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpie 2008 19:07:14 CEST -*/ - -public final class RichUnionHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.RichUnion value = null; - - public RichUnionHolder () - { - } - - public RichUnionHolder (org.apache.tuscany.sca.test.corba.generated.RichUnion initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java deleted file mode 100644 index 08ca7c699a..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public interface ScenarioOne extends ScenarioOneOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity -{ -} // interface ScenarioOne diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java deleted file mode 100644 index 6d189ddc2a..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class ScenarioOneHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioOne that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.id (), "ScenarioOne"); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne read (org.omg.CORBA.portable.InputStream istream) - { - return narrow (istream.read_Object (_ScenarioOneStub.class)); - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioOne value) - { - ostream.write_Object ((org.omg.CORBA.Object) value); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioOne) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioOne)obj; - else if (!obj._is_a (id ())) - throw new org.omg.CORBA.BAD_PARAM (); - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub (); - stub._set_delegate(delegate); - return stub; - } - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne unchecked_narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioOne) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioOne)obj; - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub (); - stub._set_delegate(delegate); - return stub; - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java deleted file mode 100644 index 6bb5fe9044..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class ScenarioOneHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.ScenarioOne value = null; - - public ScenarioOneHolder () - { - } - - public ScenarioOneHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioOne initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java deleted file mode 100644 index 43aca562ad..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public interface ScenarioOneOperations -{ - org.apache.tuscany.sca.test.corba.generated.RichStruct setRichStruct (org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct) throws org.apache.tuscany.sca.test.corba.generated.WrongColor, org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -} // interface ScenarioOneOperations diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java deleted file mode 100644 index 73c96c260d..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpie 2008 15:31:35 CEST -*/ - -public interface ScenarioSix extends ScenarioSixOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity -{ -} // interface ScenarioSix diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java deleted file mode 100644 index 6fd029ec6f..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpie 2008 15:31:35 CEST -*/ - -abstract public class ScenarioSixHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioSix that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.id (), "ScenarioSix"); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix read (org.omg.CORBA.portable.InputStream istream) - { - return narrow (istream.read_Object (_ScenarioSixStub.class)); - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioSix value) - { - ostream.write_Object ((org.omg.CORBA.Object) value); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioSix) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioSix)obj; - else if (!obj._is_a (id ())) - throw new org.omg.CORBA.BAD_PARAM (); - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub (); - stub._set_delegate(delegate); - return stub; - } - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix unchecked_narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioSix) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioSix)obj; - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub (); - stub._set_delegate(delegate); - return stub; - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java deleted file mode 100644 index 103db27cd2..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpie 2008 15:31:35 CEST -*/ - -public final class ScenarioSixHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.ScenarioSix value = null; - - public ScenarioSixHolder () - { - } - - public ScenarioSixHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioSix initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java deleted file mode 100644 index c47565e63e..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpie 2008 19:07:14 CEST -*/ - -public interface ScenarioSixOperations -{ - String[][] passStringArray (String[][] arg); - org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct passAnnotatedStruct (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg); - org.apache.tuscany.sca.test.corba.generated.RichUnion passRichUnion (org.apache.tuscany.sca.test.corba.generated.RichUnion arg); -} // interface ScenarioSixOperations diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java deleted file mode 100644 index b57e098a56..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -public interface ScenarioTwo extends ScenarioTwoOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity -{ -} // interface ScenarioTwo diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java deleted file mode 100644 index 8ddfa10575..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -abstract public class ScenarioTwoHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioTwo that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.id (), "ScenarioTwo"); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo read (org.omg.CORBA.portable.InputStream istream) - { - return narrow (istream.read_Object (_ScenarioTwoStub.class)); - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioTwo value) - { - ostream.write_Object ((org.omg.CORBA.Object) value); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioTwo) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)obj; - else if (!obj._is_a (id ())) - throw new org.omg.CORBA.BAD_PARAM (); - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub (); - stub._set_delegate(delegate); - return stub; - } - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo unchecked_narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioTwo) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)obj; - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub (); - stub._set_delegate(delegate); - return stub; - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java deleted file mode 100644 index 9717629711..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -public final class ScenarioTwoHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.ScenarioTwo value = null; - - public ScenarioTwoHolder () - { - } - - public ScenarioTwoHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java deleted file mode 100644 index 1247b4618d..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -public interface ScenarioTwoOperations -{ - String stringField (); - void stringField (String newStringField); -} // interface ScenarioTwoOperations diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java deleted file mode 100644 index 9f1cb6bc6b..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpie 2008 15:31:35 CEST -*/ - -abstract public class StringArrayHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/StringArray:1.0"; - - public static void insert (org.omg.CORBA.Any a, String[][] that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static String[][] extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0); - __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode ); - __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode ); - __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.id (), "StringArray", __typeCode); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static String[][] read (org.omg.CORBA.portable.InputStream istream) - { - String value[][] = null; - value = new String[2][]; - for (int _o0 = 0;_o0 < (2); ++_o0) - { - value[_o0] = new String[2]; - for (int _o1 = 0;_o1 < (2); ++_o1) - { - value[_o0][_o1] = istream.read_string (); - } - } - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, String[][] value) - { - if (value.length != (2)) - throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - for (int _i0 = 0;_i0 < (2); ++_i0) - { - if (value[_i0].length != (2)) - throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - for (int _i1 = 0;_i1 < (2); ++_i1) - { - ostream.write_string (value[_i0][_i1]); - } - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java deleted file mode 100644 index b2906bb13c..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpie 2008 15:31:35 CEST -*/ - -public final class StringArrayHolder implements org.omg.CORBA.portable.Streamable -{ - public String value[][] = null; - - public StringArrayHolder () - { - } - - public StringArrayHolder (String[][] initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java deleted file mode 100644 index adf72c5c35..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class StringSequenceHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/StringSequence:1.0"; - - public static void insert (org.omg.CORBA.Any a, String[] that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static String[] extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0); - __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode); - __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.id (), "StringSequence", __typeCode); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static String[] read (org.omg.CORBA.portable.InputStream istream) - { - String value[] = null; - int _len0 = istream.read_long (); - value = new String[_len0]; - for (int _o1 = 0;_o1 < value.length; ++_o1) - value[_o1] = istream.read_string (); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, String[] value) - { - ostream.write_long (value.length); - for (int _i0 = 0;_i0 < value.length; ++_i0) - ostream.write_string (value[_i0]); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java deleted file mode 100644 index ddaec3549e..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class StringSequenceHolder implements org.omg.CORBA.portable.Streamable -{ - public String value[] = null; - - public StringSequenceHolder () - { - } - - public StringSequenceHolder (String[] initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java deleted file mode 100644 index 993dc155d6..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class TwoDimLongSequenceHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequence:1.0"; - - public static void insert (org.omg.CORBA.Any a, int[][] that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static int[][] extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode); - __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", __typeCode); - __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode); - __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.id (), "TwoDimLongSequence", __typeCode); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static int[][] read (org.omg.CORBA.portable.InputStream istream) - { - int value[][] = null; - int _len0 = istream.read_long (); - value = new int[_len0][]; - for (int _o1 = 0;_o1 < value.length; ++_o1) - value[_o1] = org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.read (istream); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, int[][] value) - { - ostream.write_long (value.length); - for (int _i0 = 0;_i0 < value.length; ++_i0) - org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.write (ostream, value[_i0]); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java deleted file mode 100644 index 6e3deb2251..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class TwoDimLongSequenceHolder implements org.omg.CORBA.portable.Streamable -{ - public int value[][] = null; - - public TwoDimLongSequenceHolder () - { - } - - public TwoDimLongSequenceHolder (int[][] initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java deleted file mode 100644 index 86787ee968..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class UnexpectedException extends org.omg.CORBA.UserException -{ - public String info = null; - - public UnexpectedException () - { - super(UnexpectedExceptionHelper.id()); - } // ctor - - public UnexpectedException (String _info) - { - super(UnexpectedExceptionHelper.id()); - info = _info; - } // ctor - - - public UnexpectedException (String $reason, String _info) - { - super(UnexpectedExceptionHelper.id() + " " + $reason); - info = _info; - } // ctor - -} // class UnexpectedException diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java deleted file mode 100644 index 6a5646c73d..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class UnexpectedExceptionHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/UnexpectedException:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.UnexpectedException that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.UnexpectedException extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - private static boolean __active = false; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - synchronized (org.omg.CORBA.TypeCode.class) - { - if (__typeCode == null) - { - if (__active) - { - return org.omg.CORBA.ORB.init().create_recursive_tc ( _id ); - } - __active = true; - org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); - _members0[0] = new org.omg.CORBA.StructMember ( - "info", - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.id (), "UnexpectedException", _members0); - __active = false; - } - } - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.UnexpectedException read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.UnexpectedException value = new org.apache.tuscany.sca.test.corba.generated.UnexpectedException (); - // read and discard the repository ID - istream.read_string (); - value.info = istream.read_string (); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.UnexpectedException value) - { - // write the repository ID - ostream.write_string (id ()); - ostream.write_string (value.info); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java deleted file mode 100644 index 0f62442652..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class UnexpectedExceptionHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.UnexpectedException value = null; - - public UnexpectedExceptionHolder () - { - } - - public UnexpectedExceptionHolder (org.apache.tuscany.sca.test.corba.generated.UnexpectedException initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java deleted file mode 100644 index 1167c7de21..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/WrongColor.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class WrongColor extends org.omg.CORBA.UserException -{ - public org.apache.tuscany.sca.test.corba.generated.Color givenColor = null; - public org.apache.tuscany.sca.test.corba.generated.Color correctColor = null; - - public WrongColor () - { - super(WrongColorHelper.id()); - } // ctor - - public WrongColor (org.apache.tuscany.sca.test.corba.generated.Color _givenColor, org.apache.tuscany.sca.test.corba.generated.Color _correctColor) - { - super(WrongColorHelper.id()); - givenColor = _givenColor; - correctColor = _correctColor; - } // ctor - - - public WrongColor (String $reason, org.apache.tuscany.sca.test.corba.generated.Color _givenColor, org.apache.tuscany.sca.test.corba.generated.Color _correctColor) - { - super(WrongColorHelper.id() + " " + $reason); - givenColor = _givenColor; - correctColor = _correctColor; - } // ctor - -} // class WrongColor diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java deleted file mode 100644 index fc32fd1db6..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class WrongColorHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.WrongColor that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.WrongColor extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - private static boolean __active = false; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - synchronized (org.omg.CORBA.TypeCode.class) - { - if (__typeCode == null) - { - if (__active) - { - return org.omg.CORBA.ORB.init().create_recursive_tc ( _id ); - } - __active = true; - org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [2]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type (); - _members0[0] = new org.omg.CORBA.StructMember ( - "givenColor", - _tcOf_members0, - null); - _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type (); - _members0[1] = new org.omg.CORBA.StructMember ( - "correctColor", - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.id (), "WrongColor", _members0); - __active = false; - } - } - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.WrongColor read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.WrongColor value = new org.apache.tuscany.sca.test.corba.generated.WrongColor (); - // read and discard the repository ID - istream.read_string (); - value.givenColor = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream); - value.correctColor = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.WrongColor value) - { - // write the repository ID - ostream.write_string (id ()); - org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.givenColor); - org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.correctColor); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java deleted file mode 100644 index 9648e29d6d..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class WrongColorHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.WrongColor value = null; - - public WrongColorHolder () - { - } - - public WrongColorHolder (org.apache.tuscany.sca.test.corba.generated.WrongColor initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.type (); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java deleted file mode 100644 index 93d9fe164d..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public abstract class _ScenarioOneImplBase extends org.omg.CORBA.portable.ObjectImpl - implements org.apache.tuscany.sca.test.corba.generated.ScenarioOne, org.omg.CORBA.portable.InvokeHandler -{ - - // Constructors - public _ScenarioOneImplBase () - { - } - - private static java.util.Hashtable _methods = new java.util.Hashtable (); - static - { - _methods.put ("setRichStruct", new java.lang.Integer (0)); - } - - public org.omg.CORBA.portable.OutputStream _invoke (String $method, - org.omg.CORBA.portable.InputStream in, - org.omg.CORBA.portable.ResponseHandler $rh) - { - org.omg.CORBA.portable.OutputStream out = null; - java.lang.Integer __method = (java.lang.Integer)_methods.get ($method); - if (__method == null) - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - - switch (__method.intValue ()) - { - case 0: // org/apache/tuscany/sca/test/corba/generated/ScenarioOne/setRichStruct - { - try { - org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read (in); - org.apache.tuscany.sca.test.corba.generated.RichStruct $result = null; - $result = this.setRichStruct (richStruct); - out = $rh.createReply(); - org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write (out, $result); - } catch (org.apache.tuscany.sca.test.corba.generated.WrongColor $ex) { - out = $rh.createExceptionReply (); - org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.write (out, $ex); - } catch (org.apache.tuscany.sca.test.corba.generated.UnexpectedException $ex) { - out = $rh.createExceptionReply (); - org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.write (out, $ex); - } - break; - } - - default: - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - } - - return out; - } // _invoke - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - -} // class _ScenarioOneImplBase diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java deleted file mode 100644 index 622adaf46b..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pitek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public class _ScenarioOneStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioOne -{ - - public org.apache.tuscany.sca.test.corba.generated.RichStruct setRichStruct (org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct) throws org.apache.tuscany.sca.test.corba.generated.WrongColor, org.apache.tuscany.sca.test.corba.generated.UnexpectedException - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("setRichStruct", true); - org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write ($out, richStruct); - $in = _invoke ($out); - org.apache.tuscany.sca.test.corba.generated.RichStruct $result = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read ($in); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - if (_id.equals ("IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0")) - throw org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.read ($in); - else if (_id.equals ("IDL:org/apache/tuscany/sca/test/corba/generated/UnexpectedException:1.0")) - throw org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.read ($in); - else - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return setRichStruct (richStruct ); - } finally { - _releaseReply ($in); - } - } // setRichStruct - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - private void readObject (java.io.ObjectInputStream s) throws java.io.IOException - { - String str = s.readUTF (); - String[] args = null; - java.util.Properties props = null; - org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str); - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate (); - _set_delegate (delegate); - } - - private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException - { - String[] args = null; - java.util.Properties props = null; - String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this); - s.writeUTF (str); - } -} // class _ScenarioOneStub diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java deleted file mode 100644 index 117d1d6382..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpie 2008 23:35:36 CEST -*/ - -public abstract class _ScenarioSixImplBase extends org.omg.CORBA.portable.ObjectImpl - implements org.apache.tuscany.sca.test.corba.generated.ScenarioSix, org.omg.CORBA.portable.InvokeHandler -{ - - // Constructors - public _ScenarioSixImplBase () - { - } - - private static java.util.Hashtable _methods = new java.util.Hashtable (); - static - { - _methods.put ("passStringArray", new java.lang.Integer (0)); - _methods.put ("passAnnotatedStruct", new java.lang.Integer (1)); - _methods.put ("passRichUnion", new java.lang.Integer (2)); - } - - public org.omg.CORBA.portable.OutputStream _invoke (String $method, - org.omg.CORBA.portable.InputStream in, - org.omg.CORBA.portable.ResponseHandler $rh) - { - org.omg.CORBA.portable.OutputStream out = null; - java.lang.Integer __method = (java.lang.Integer)_methods.get ($method); - if (__method == null) - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - - switch (__method.intValue ()) - { - case 0: // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passStringArray - { - String arg[][] = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (in); - String $result[][] = null; - $result = this.passStringArray (arg); - out = $rh.createReply(); - org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (out, $result); - break; - } - - case 1: // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passAnnotatedStruct - { - org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read (in); - org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct $result = null; - $result = this.passAnnotatedStruct (arg); - out = $rh.createReply(); - org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write (out, $result); - break; - } - - case 2: // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passRichUnion - { - org.apache.tuscany.sca.test.corba.generated.RichUnion arg = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read (in); - org.apache.tuscany.sca.test.corba.generated.RichUnion $result = null; - $result = this.passRichUnion (arg); - out = $rh.createReply(); - org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write (out, $result); - break; - } - - default: - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - } - - return out; - } // _invoke - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - -} // class _ScenarioSixImplBase diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java deleted file mode 100644 index eba1b61fa3..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpie 2008 19:07:14 CEST -*/ - -public class _ScenarioSixStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioSix -{ - - public String[][] passStringArray (String[][] arg) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("passStringArray", true); - org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write ($out, arg); - $in = _invoke ($out); - String $result[][] = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read ($in); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return passStringArray (arg ); - } finally { - _releaseReply ($in); - } - } // passStringArray - - public org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct passAnnotatedStruct (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("passAnnotatedStruct", true); - org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write ($out, arg); - $in = _invoke ($out); - org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct $result = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read ($in); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return passAnnotatedStruct (arg ); - } finally { - _releaseReply ($in); - } - } // passAnnotatedStruct - - public org.apache.tuscany.sca.test.corba.generated.RichUnion passRichUnion (org.apache.tuscany.sca.test.corba.generated.RichUnion arg) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("passRichUnion", true); - org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write ($out, arg); - $in = _invoke ($out); - org.apache.tuscany.sca.test.corba.generated.RichUnion $result = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read ($in); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return passRichUnion (arg ); - } finally { - _releaseReply ($in); - } - } // passRichUnion - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - private void readObject (java.io.ObjectInputStream s) throws java.io.IOException - { - String str = s.readUTF (); - String[] args = null; - java.util.Properties props = null; - org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str); - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate (); - _set_delegate (delegate); - } - - private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException - { - String[] args = null; - java.util.Properties props = null; - String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this); - s.writeUTF (str); - } -} // class _ScenarioSixStub diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java deleted file mode 100644 index 750006cec6..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -public abstract class _ScenarioTwoImplBase extends org.omg.CORBA.portable.ObjectImpl - implements org.apache.tuscany.sca.test.corba.generated.ScenarioTwo, org.omg.CORBA.portable.InvokeHandler -{ - - // Constructors - public _ScenarioTwoImplBase () - { - } - - private static java.util.Hashtable _methods = new java.util.Hashtable (); - static - { - _methods.put ("_get_stringField", new java.lang.Integer (0)); - _methods.put ("_set_stringField", new java.lang.Integer (1)); - } - - public org.omg.CORBA.portable.OutputStream _invoke (String $method, - org.omg.CORBA.portable.InputStream in, - org.omg.CORBA.portable.ResponseHandler $rh) - { - org.omg.CORBA.portable.OutputStream out = null; - java.lang.Integer __method = (java.lang.Integer)_methods.get ($method); - if (__method == null) - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - - switch (__method.intValue ()) - { - case 0: // org/apache/tuscany/sca/test/corba/generated/ScenarioTwo/_get_stringField - { - String $result = null; - $result = this.stringField (); - out = $rh.createReply(); - out.write_string ($result); - break; - } - - case 1: // org/apache/tuscany/sca/test/corba/generated/ScenarioTwo/_set_stringField - { - String newStringField = in.read_string (); - this.stringField (newStringField); - out = $rh.createReply(); - break; - } - - default: - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - } - - return out; - } // _invoke - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - -} // class _ScenarioTwoImplBase diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java deleted file mode 100644 index ef9f561d1b..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -public class _ScenarioTwoStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioTwo -{ - - public String stringField () - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("_get_stringField", true); - $in = _invoke ($out); - String $result = $in.read_string (); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return stringField ( ); - } finally { - _releaseReply ($in); - } - } // stringField - - public void stringField (String newStringField) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("_set_stringField", true); - $out.write_string (newStringField); - $in = _invoke ($out); - return; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - stringField (newStringField ); - } finally { - _releaseReply ($in); - } - } // stringField - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - private void readObject (java.io.ObjectInputStream s) throws java.io.IOException - { - String str = s.readUTF (); - String[] args = null; - java.util.Properties props = null; - org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str); - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate (); - _set_delegate (delegate); - } - - private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException - { - String[] args = null; - java.util.Properties props = null; - String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this); - s.writeUTF (str); - } -} // class _ScenarioTwoStub diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java deleted file mode 100644 index 4f6eacc9ff..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.test.corba.types; - -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - * Operations for scenario five - */ -@Remotable -public interface ScenarioFive { - - void doNothing(); - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java deleted file mode 100644 index a3be6daa23..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.test.corba.types; - -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - * Component for obtaining ScenarioFive reference - */ -public class ScenarioFiveComponent { - - private ScenarioFive scenarioFive; - - @Reference - public void setScenarioFive(ScenarioFive scenarioFive) { - this.scenarioFive = scenarioFive; - } - - public ScenarioFive getScenarioFive() { - return scenarioFive; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java deleted file mode 100644 index dc752a2aea..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Implementation of ScenarioFive service - */ -public class ScenarioFiveImpl implements ScenarioFive { - - public void doNothing() { - // does nothing - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java deleted file mode 100644 index aec0f7b1bf..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - * Operations for ScenarioFour - */ -@Remotable -public interface ScenarioFour { - - ScenarioFourStruct setStruct(ScenarioFourStruct struct); - - void exceptionTest() throws ScenarioFourException; - - ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo); - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java deleted file mode 100644 index 04aef326af..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.test.corba.types; - -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - * Component for obtaining ScenarioFour reference - */ -public class ScenarioFourComponent { - - private ScenarioFour scenarioFour; - - @Reference - public void setScenarioFour(ScenarioFour scenarioFour) { - this.scenarioFour = scenarioFour; - } - - public ScenarioFour getScenarioFour() { - return scenarioFour; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java deleted file mode 100644 index bc76373633..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Exception for ScenarioFour tests - */ -public class ScenarioFourException extends Exception { - - public static final String DEFAULT_CONTENT = "Test"; - - private static final long serialVersionUID = 1L; - private String content; - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java deleted file mode 100644 index 2f10177bd0..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; - -/** - * @version $Rev$ $Date$ - * Implementation of ScenarioFour service - */ -public class ScenarioFourImpl implements ScenarioFour { - - public ScenarioFourStruct setStruct(ScenarioFourStruct struct) { - return struct; - } - - public void exceptionTest() throws ScenarioFourException { - ScenarioFourException exception = new ScenarioFourException(); - exception.setContent(ScenarioFourException.DEFAULT_CONTENT); - throw exception; - } - - public ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo) { - return scenarioFourSdo; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java deleted file mode 100644 index de8624455f..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Type for ScenarioFour test - */ -public class ScenarioFourStruct { - - public String field1; - public int field2; - public double[] field3; - - public boolean equals(ScenarioFourStruct arg) { - return (field1 != null && arg.field1 != null - && field1.equals(arg.field1) - && field2 == arg.field2 - && field3 != null - && arg.field3 != null && field3.length == arg.field3.length); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java deleted file mode 100644 index 30e4e2994a..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.RichStruct; -import org.apache.tuscany.sca.test.corba.generated.ScenarioOne; -import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations; -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - * Component for reference using generated interface. - */ -public class ScenarioOneComponent implements ScenarioOneOperations { - - private ScenarioOne scenarionOne; - - @Reference - public void setScenarioOne(ScenarioOne scenarioOne) { - this.scenarionOne = scenarioOne; - } - - public RichStruct setRichStruct(RichStruct richStruct) throws WrongColor, UnexpectedException { - return scenarionOne.setRichStruct(richStruct); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java deleted file mode 100644 index 9b49adbfbb..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.Color; -import org.apache.tuscany.sca.test.corba.generated.RichStruct; -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.apache.tuscany.sca.test.corba.generated._ScenarioOneImplBase; - -/** - * @version $Rev$ $Date$ - * Servant for generated interface. Uses generated classes. - */ -public class ScenarioOneServant extends _ScenarioOneImplBase { - - private static final long serialVersionUID = 1L; - - public RichStruct setRichStruct(RichStruct richStruct) throws WrongColor, UnexpectedException { - if (richStruct.innerStruct.color.value() == Color.red.value()) { - throw new WrongColor(richStruct.innerStruct.color, Color.green); - } else if (richStruct.longField == 0) { - throw new UnexpectedException("Expected richStruct.longField != 0"); - } - return richStruct; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java deleted file mode 100644 index 7889a80bf1..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct; -import org.apache.tuscany.sca.test.corba.generated.RichUnion; -import org.apache.tuscany.sca.test.corba.generated._ScenarioSixImplBase; - -/** - * @version $Rev$ $Date$ - * Scenario six servant for generated interface. - */ -public class ScenarioSixServant extends _ScenarioSixImplBase { - - private static final long serialVersionUID = 1L; - - public String[][] passStringArray(String[][] arg) { - return arg; - } - - public AnnotatedStruct passAnnotatedStruct(AnnotatedStruct arg) { - return arg; - } - - public RichUnion passRichUnion(RichUnion arg) { - return arg; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java deleted file mode 100644 index cdd49904d3..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated._ScenarioTwoImplBase; - -/** - * @version $Rev$ $Date$ - * Servant for generated interface. - */ -public class ScenarioTwoServant extends _ScenarioTwoImplBase { - - private static final long serialVersionUID = 1L; - - private String stringField = ""; - - public String stringField() { - return stringField; - } - - public void stringField(String newStringField) { - this.stringField = newStringField; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java deleted file mode 100644 index adb48aa159..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.binding.corba.meta.CorbaArray; - -/** - * @version $Rev$ $Date$ Scenario six structure used by Tuscany. - */ -public final class TAnnotatedStruct { - - @CorbaArray( {2, 2}) - public String[][] stringArray; - - public TAnnotatedStruct() { - - } - - public TAnnotatedStruct(String[][] stringArray) { - this.stringArray = stringArray; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java deleted file mode 100644 index 71003d008f..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * User provided enum representation for Color type. - */ -public class TColor { - - private int value; - - public static final int _red = 0; - public static final int _yellow = 1; - public static final int _green = 2; - - public static final TColor red = new TColor(_red); - public static final TColor yellow = new TColor(_yellow); - public static final TColor green = new TColor(_green); - - public int value() { - return value; - } - - public static TColor from_int(int value) { - switch (value) { - case 0: - return red; - case 1: - return yellow; - case 2: - return green; - } - return green; - } - - protected TColor(int value) { - this.value = value; - } - - public TColor() { - - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java deleted file mode 100644 index 271f1e669b..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * User provided interface representation for InnerStruct type. - */ -public final class TInnerStruct { - - public int[][] twoDimLongSequence; - public String stringField; - public TColor color; - - public TInnerStruct() { - - } - - public TInnerStruct(int[][] a1, String a2, TColor a3) { - twoDimLongSequence = a1; - stringField = a2; - color = a3; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java deleted file mode 100644 index d7734c48a3..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElement; -import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElementType; - -/** - * @version $Rev$ $Date$ - * User provided interface representation for CORBA InnerUnion type. - */ -public final class TInnerUnion { - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1) - private int x; - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2) - private float y; - - @CorbaUnionElement(type = CorbaUnionElementType.discriminator) - @SuppressWarnings("unused") - private int discriminator; - - public int getX() { - return x; - } - - public void setX(int x) { - discriminator = 1; - this.x = x; - } - - public float getY() { - return y; - } - - public void setY(float y) { - discriminator = 2; - this.y = y; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java deleted file mode 100644 index 1b44da9752..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * User provided interface representation for RichStruct type. - */ -public final class TRichStruct { - - public TInnerStruct innerStruct; - public String[] stringSequence; - public int longField; - - public TRichStruct() { - - } - - public TRichStruct(TInnerStruct a1, String[] a2, int a3) { - innerStruct = a1; - stringSequence = a2; - longField = a3; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java deleted file mode 100644 index eb76c94643..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElement; -import org.apache.tuscany.sca.binding.corba.meta.CorbaUnionElementType; - -/** - * @version $Rev$ $Date$ - * User provided interface representation for CORBA RichUnion type. - */ -public final class TRichUnion { - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1) - private int x; - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2) - private float y; - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 3) - private String z; - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 4) - private TInnerUnion iu; - - @CorbaUnionElement(type = CorbaUnionElementType.defaultOption) - private boolean def; - - @CorbaUnionElement(type = CorbaUnionElementType.discriminator) - @SuppressWarnings("unused") - private int discriminator = -1; - - public int getX() { - return x; - } - - public void setX(int x) { - this.discriminator = 1; - this.x = x; - } - - public float getY() { - return y; - } - - public void setY(float y) { - this.discriminator = 2; - this.y = y; - } - - public String getZ() { - return z; - } - - public void setZ(String z) { - this.discriminator = 3; - this.z = z; - } - - public boolean isDef() { - return def; - } - - public void setDef(boolean def) { - this.discriminator = -1; - this.def = def; - } - - public TInnerUnion getIu() { - return iu; - } - - public void setIu(TInnerUnion iu) { - this.discriminator = 4; - this.iu = iu; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java deleted file mode 100644 index 922759cd8d..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; - -/** - * @version $Rev$ $Date$ - * User provided CORBA service interface. - */ -public interface TScenarioOne { - - TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException; - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java deleted file mode 100644 index a4f15488cd..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - * Component for reference using user provided interface. - */ -public class TScenarioOneComponent implements TScenarioOne { - - private TScenarioOne scenarionOne; - - @Reference - public void setScenarioOne(TScenarioOne scenarioOne) { - this.scenarionOne = scenarioOne; - } - - public TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException { - return scenarionOne.setRichStruct(richStruct); - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java deleted file mode 100644 index 47f0775c16..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.Color; -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; - -/** - * @version $Rev$ $Date$ - * Servant for user provided interface. Uses T* classes. - */ -public class TScenarioOneServant implements TScenarioOne { - - private static final long serialVersionUID = 1L; - - public TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException { - if (richStruct.innerStruct.color.value() == Color.red.value()) { - Color translatedColor = Color.from_int(richStruct.innerStruct.color.value()); - throw new WrongColor(translatedColor, Color.green); - } else if (richStruct.longField == 0) { - throw new UnexpectedException("Expected richStruct.longField != 0"); - } - return richStruct; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java deleted file mode 100644 index 3b4943a43d..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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.test.corba.types; - -import org.apache.tuscany.sca.binding.corba.meta.CorbaArray; - -/** - * @version $Rev$ $Date$ - * Operations for scenario six. - */ -public interface TScenarioSix { - - @CorbaArray( {2, 2}) - public String[][] passStringArray(@CorbaArray( {2, 2})String[][] arg); - - public TAnnotatedStruct passAnnotatedStruct(TAnnotatedStruct arg); - - public TRichUnion passRichUnion(TRichUnion arg); - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java deleted file mode 100644 index 7d43badb23..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.test.corba.types; - -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - * Component for obtaining ScenartioSix reference. - */ -public class TScenarioSixComponent { - - private TScenarioSix scenarioSix; - - @Reference - public void setScenarioSix(TScenarioSix scenarioSix) { - this.scenarioSix = scenarioSix; - } - - public TScenarioSix getScenarioSix() { - return scenarioSix; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java deleted file mode 100644 index 8e76958e31..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Tuscany scenario six servant. - */ -public class TScenarioSixServant implements TScenarioSix { - - private static final long serialVersionUID = 1L; - - public String[][] passStringArray(String[][] arg) { - return arg; - } - - public TAnnotatedStruct passAnnotatedStruct(TAnnotatedStruct arg) { - return arg; - } - - public TRichUnion passRichUnion(TRichUnion arg) { - return arg; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java deleted file mode 100644 index 1e4264256b..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Operations for ScenarioThree. - */ -public interface TScenarioThree { - - int getIntField(); - - void setIntField(int intField); - - void overloadedName(); - - void overloadedName(String arg1); - - void overloadedName(String arg1, int arg2); - - int caseDifferent(); - - int CaseDifferent(); - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java deleted file mode 100644 index 917cceedf5..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.test.corba.types; - -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - * Component for obtaining ScenartioThree reference. - */ -public class TScenarioThreeComponent { - - private TScenarioThree scenarionThree; - - @Reference - public void setScenarioThree(TScenarioThree scenarioThree) { - this.scenarionThree = scenarioThree; - } - - public TScenarioThree getScenarioThree() { - return scenarionThree; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java deleted file mode 100644 index b679214c6c..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Servant for user provided interface. - */ -public class TScenarioThreeServant implements TScenarioThree { - - public int getIntField() { - return 0; - } - - public void overloadedName() { - } - - public void overloadedName(String arg1) { - } - - public void overloadedName(String arg1, int arg2) { - } - - public void setIntField(int intField) { - } - - public int CaseDifferent() { - return 1; - } - - public int caseDifferent() { - return 0; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java deleted file mode 100644 index 415634c80f..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Operations for ScenarioTwo. - */ -public interface TScenarioTwo { - - String getStringField(); - - void setStringField(String stringField); - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java deleted file mode 100644 index d7c72b40da..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.test.corba.types; - -import org.osoa.sca.annotations.Reference; - -/** - * @version $Rev$ $Date$ - * Component for obtaining ScenartioTwo reference. - */ -public class TScenarioTwoComponent { - - private TScenarioTwo scenarioTwo; - - @Reference - public void setScenarioTwo(TScenarioTwo scenarioTwo) { - this.scenarioTwo = scenarioTwo; - } - - public TScenarioTwo getScenarioTwo() { - return scenarioTwo; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java deleted file mode 100644 index cb868d18a0..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Servant for user provided interface. - */ -public class TScenarioTwoServant implements TScenarioTwo { - - private static String stringField = ""; - - public String getStringField() { - return stringField; - } - - public void setStringField(String stringField) { - TScenarioTwoServant.stringField = stringField; - } - -} diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/tags/java/sca/1.5.1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator deleted file mode 100644 index 3e77527d73..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -org.apache.tuscany.sca.test.corba.TestCorbaHostModuleActivator diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFive.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFive.composite deleted file mode 100644 index 3c73e238a5..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFive.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFour.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFour.composite deleted file mode 100644 index 01d7e2314a..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioFour.composite +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioOne.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioOne.composite deleted file mode 100644 index c10b383661..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioOne.composite +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioSix.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioSix.composite deleted file mode 100644 index 88238478c1..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioSix.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioThree.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioThree.composite deleted file mode 100644 index f43e4a3f7a..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioThree.composite +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioTwo.composite b/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioTwo.composite deleted file mode 100644 index dc5ddc50d3..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/resources/ScenarioTwo.composite +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/itest_scenario.idl b/tags/java/sca/1.5.1/itest/corba/src/test/resources/itest_scenario.idl deleted file mode 100644 index 41489a4565..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/resources/itest_scenario.idl +++ /dev/null @@ -1,110 +0,0 @@ -/* - * 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. - */ - -/* - * compile by - * idlj -fall -oldImplBase itest_scenario.idl - */ - -module org { - module apache { - module tuscany { - module sca { - module test { - module corba { - module generated { - - // objects for ScenarioOne - - enum Color {red, yellow, green}; - - typedef sequence StringSequence; - typedef sequence LongSequence; - typedef sequence TwoDimLongSequence; - - struct InnerStruct { - TwoDimLongSequence twoDimLongSequence; - string stringField; - Color color; - }; - - struct RichStruct { - InnerStruct innerStruct; - StringSequence stringSequence; - long longField; - }; - - exception WrongColor { - Color givenColor; - Color correctColor; - }; - - exception UnexpectedException { - string info; - }; - - interface ScenarioOne { - - RichStruct setRichStruct(in RichStruct richStruct) raises (WrongColor, UnexpectedException); - - }; - - // objects for ScenarioTwo - - interface ScenarioTwo { - - attribute string stringField; - - }; - - typedef string StringArray[2][2]; - - struct AnnotatedStruct { - StringArray stringArray; - }; - - union InnerUnion switch (long) { - case 1: long x; - case 2: float y; - }; - - union RichUnion switch (long) { - case 1: long x; - case 2: float y; - case 3: string z; - case 4: InnerUnion iu; - default: boolean a; - }; - - interface ScenarioSix { - - StringArray passStringArray(in StringArray arg); - - AnnotatedStruct passAnnotatedStruct(in AnnotatedStruct arg); - - RichUnion passRichUnion(in RichUnion arg); - - }; - }; - }; - }; - }; - }; - }; -}; diff --git a/tags/java/sca/1.5.1/itest/corba/src/test/resources/scenariofour.xsd b/tags/java/sca/1.5.1/itest/corba/src/test/resources/scenariofour.xsd deleted file mode 100644 index 2669b54be3..0000000000 --- a/tags/java/sca/1.5.1/itest/corba/src/test/resources/scenariofour.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/pom.xml b/tags/java/sca/1.5.1/itest/databindings/common/pom.xml deleted file mode 100644 index da93a73f53..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - org.apache.tuscany.sca - itest-databindings - 1.5.1 - - - 4.0.0 - - itest-databindings-common - 1.5.1 - jar - Apache Tuscany SCA iTest Databinding Common - - - - - true - - java.net - java.net Maven 1.x Repository - http://download.java.net/maven/1 - legacy - - - - - - - true - - java.net - java.net Maven 1.x Repository - http://download.java.net/maven/1 - legacy - - - - - - org.apache.tuscany.sca - tuscany-databinding-sdo - ${pom.version} - compile - - - org.apache.tuscany.sdo - tuscany-sdo-tools - 1.1.1 - compile - - - velocity - velocity - 1.4 - compile - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.0 - - - add-test-source - generate-sources - - add-test-source - - - - target/sdo-source - - - - - - - org.apache.tuscany.sdo - tuscany-sdo-plugin - 1.1.1 - - - generate-sdo - generate-sources - - - - ${basedir}/src/main/resources/generate/generate.xsd - - - true - true - true - - - generate - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/tags/java/sca/1.5.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java deleted file mode 100644 index adb546a1ea..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * 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.generate; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.util.List; -import java.util.Properties; - -import org.apache.tuscany.generate.GenerateFactory; -import org.apache.tuscany.generate.GenerateType; -import org.apache.tuscany.generate.InputFileType; -import org.apache.tuscany.generate.TemplateType; -import org.apache.tuscany.sdo.generate.XSD2JavaGenerator; -import org.apache.tuscany.sdo.util.SDOUtil; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; - -import commonj.sdo.helper.HelperContext; -import commonj.sdo.helper.XMLDocument; - -/** - * Generates test files based on the information in a configuration files (generate.xml) - * and a set of velocity templates. The process is - * - * for each template - * for each xsd file - * generate SDOs - * include the factory into the composite - * for each type - * add client iface method - * add client impl method - * add service iface method - * add service impl method - * add test method - * add wsdl type and method - * - * @version $Rev$ $Date$ - */ -public class Generate { - - /** - * Does all the hard work of running the velocity templates against the - * the list of types to test. Both the list of templates and the list of - * XSD files is held in the configuration file (generate.xsd) which lives in the - * resources/generate directory of the project being generated. - * - * @param projectBuildDir the path to the target dir of the project being generated. - */ - public static void generate(String projectBuildDir) { - System.out.println(">> Building project from dir: " + projectBuildDir); - FileInputStream fis = null; - - try { - // Load the config file into a stream - fis = new FileInputStream(projectBuildDir + "/classes/generate/generate.xml"); - - // Load the stream into SDO - // We are just using SDO as a convenient way to parse the XML config file - HelperContext scope = SDOUtil.createHelperContext(); - GenerateFactory.INSTANCE.register(scope); - XMLDocument xmlDoc = scope.getXMLHelper().load(fis); - GenerateType generateType = (GenerateType)xmlDoc.getRootObject(); - - // Get the file list. This is the list of XSD that is passed into the - // the velocity templates. Each configured file holds a list of types - // that the velocity templates expand into appropriate methods and method calls - List fileList = generateType.getInputFile(); - - //Initialise velocity ready to generate the various files - Properties p = new Properties(); - p.setProperty("file.resource.loader.path", projectBuildDir + "/classes/generate"); - Velocity.init(p); - VelocityContext context = new VelocityContext(); - context.put("fileList", fileList); - - List templateList = generateType.getTemplate(); - - // For each velocity template in the template list pass in the XSD file list - for ( Object item: templateList){ - TemplateType template = (TemplateType)item; - context.put("template", template); - String tmp = template.getTemplateName(); - String filename = projectBuildDir + "/" + template.getTemplateTargetDir() + "/" + tmp.substring(0,tmp.length() - 3); - File f = new File(filename); - // Create folders since the package doesn't exist before the code-gen for the 1st time - f.getParentFile().mkdirs(); - FileWriter fw = new FileWriter(f); - System.out.println(">> Processing " + template.getTemplateName() + " to " + filename); - Velocity.mergeTemplate(template.getTemplateName(), context, fw ); - fw.flush(); - fw.close(); - } - - - } catch (Exception e) { - System.out.println("Exception : " + e.toString()); - e.printStackTrace(); - return; - } - } - - /** - * The SDO generator tool does all of the hard work - * - * @param projectBuildDir the path to the target dir of the project being generated. - */ - public static void generateSDO(String projectBuildDir) { - System.out.println(">> Building SDOs from dir: " + projectBuildDir); - FileInputStream fis = null; - - try { - // Load the config file into a stream - fis = new FileInputStream(projectBuildDir + "/classes/generate/generate.xml"); - - // Load the stream into SDO - // We are just using SDO as a convenient way to parse the XML config file - HelperContext scope = SDOUtil.createHelperContext(); - GenerateFactory.INSTANCE.register(scope); - XMLDocument xmlDoc = scope.getXMLHelper().load(fis); - GenerateType generateType = (GenerateType)xmlDoc.getRootObject(); - - // Get the file list. This is the list of XSD that is passed into the - // the velocity templates. Each configured file holds a list of types - // that the velocity templates expand into appropriate methods and method calls - List fileList = generateType.getInputFile(); - - // for each XSD in the XSD file list generate an SDO. - XSD2JavaGenerator generator = new XSD2JavaGenerator(); - - for ( Object item : fileList){ - InputFileType file = (InputFileType)item; - - XSD2JavaGenerator.generateFromXMLSchema(projectBuildDir + "/classes/xsd/" + file.getFileName(), - file.getNamespace(), - projectBuildDir + "/sdo-source", - file.getJavaPackage(), - null, //file.getPrefix(), - XSD2JavaGenerator.OPTION_NO_CONTAINMENT | XSD2JavaGenerator.OPTION_NO_NOTIFICATION | XSD2JavaGenerator.OPTION_NO_UNSETTABLE); - - } - - } catch (Exception e) { - System.out.println("Exception : " + e.toString()); - e.printStackTrace(); - return; - } - } - - /** - * The mainline - * - * @param args the target directory where project in which files are being generated - */ - public static void main(String[] args) { - - Generate.generate(args[0]); - - if (args.length > 1){ - Generate.generateSDO(args[0]); - } - } - -} diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm deleted file mode 100644 index b2346aa973..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm +++ /dev/null @@ -1,112 +0,0 @@ -/* - * 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 $template.getJavaPackage(); - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; - -import ${template.getJavaPackage()}.GreeterService; - -// Data types -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -import $file.getJavaPackage().$file.getFactory(); -#end -#end - -/** - * Automatically generated test case. Calls the greeter client for a number of - * bindings and a number of data types. - * - * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $ - */ -public class DatabindingTestCase extends TestCase { - - private SCADomain domain; - private GreeterService greeterClient; - - /** - * Runs before each test method - */ - protected void setUp() throws Exception { - domain = SCADomain.newInstance("greeter.composite"); - super.setUp(); - } - - /** - * Runs after each test method - */ - protected void tearDown() { - domain.close(); - } - - /** - * Finds the SCA component that relates to the protocol being tested. This test - * always connects locally to the client component but the client component will - * connect to the back end component using the appropriate protocol - * - * @param ext the protcol required - */ - private void setUpClient(String ext) throws Exception { - greeterClient = domain.getService(GreeterService.class, ext + "GreeterServiceClient"); - } - - /** - * Invokes the SDO Greet service using web service bindings with SDO payload - */ - public void testWSGreet() throws Exception { - setUpClient("WS"); - greet(); - } - - /** - * Invokes the SDO Greet service using default bindings with SDO payload - */ - public void testDefaultGreet() throws Exception { - setUpClient("Default"); - greet(); - } - - /** - * A generic method which, regarless of which client is connected, sends out a - * series of requrests passing different data types. - */ - public void greet() { -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - // test $typeInstance.getTypeName() - { - $typeInstance.getTypeName() param = null; - $typeInstance.getCreateTypeCode() - $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param); - $typeInstance.getResultComparison() - } -#end -#end - } - -} diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm deleted file mode 100644 index 88616cc997..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - -#foreach($file in $fileList) - -#end - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - - - - -#end -#end - - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - - - - -#end -#end - - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - -#end -#end - - - - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - - - - - - -#end -#end - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm deleted file mode 100644 index 77a12e92ec..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 $template.getJavaPackage(); - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -#end -#end - -import org.osoa.sca.annotations.Remotable; - -/** - * The automatically generated interface to the service that reflects data objects - * that are sent to it - * - * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $ - */ -@Remotable -public interface GreeterService { - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - /** - * Take the provided data object, change it slightly and return it - * - * @param param the data object to be changed and returned - * @return the change data object - */ - $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param); -#end -#end - -} diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm deleted file mode 100644 index ee73db6152..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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 $template.getJavaPackage(); - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -#end -#end - -import org.osoa.sca.annotations.AllowsPassByReference; - -/** - * GreeterServiceClient - */ -@AllowsPassByReference -public interface GreeterServiceClient { -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param); -#end -#end -} diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm deleted file mode 100644 index aab564dc1e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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 $template.getJavaPackage(); - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -#end -#end - -/** - * The automatically generated service that simply forwards data objects on to - * the GreeterService and passes back the responses - * - * @version $Rev: 508831 $ $Date: 2007-02-18 00:12:31 +0000 (Sun, 18 Feb 2007) $ - */ -@Service(GreeterService.class) -public class GreeterServiceClientImpl implements GreeterService { - - /** - * the reference the the GreeterService that will - * change each data object slightly and return it - */ - private GreeterService service; - - @Reference - public void setGreeterService(GreeterService service) { - this.service = service; - } -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.itest.sdodatabinding.GreeterService#greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) - */ - public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) { - return service.greet$typeInstance.getTypeName()(param); - } -#end -#end -} diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm deleted file mode 100644 index 5507a0b747..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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 $template.getJavaPackage(); - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -#end -#end - -import org.osoa.sca.annotations.Service; - -/** - * The automatically generated service implementation that reflects data objects - * that are sent to it - * - * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $ - */ -@Service(GreeterService.class) -public class GreeterServiceImpl implements GreeterService { -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - /** - * Take the provided data object, change it slightly and return it - * - * @param param the data object to be changed and returned - * @return the change data object - */ - public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) { - $typeInstance.getModifyTypeCode() - return param; - } -#end -#end -} diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/generate.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/generate.xsd deleted file mode 100644 index 1fabedf55f..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/generate/generate.xsd +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt deleted file mode 100644 index 8927d725b6..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt +++ /dev/null @@ -1,4 +0,0 @@ -A dummy file that causes the target/classes/wsdl dir to be created in the generated test project. This is -required because the test generator must run in the process-resource phase, after generate.xml has been copied -into target. The generator needs to write out target/classes/wsdl and will fail the directory isn't there. So -this file just gets unpacked and forces the directory to be created. diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml deleted file mode 100644 index f1f4346e58..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd deleted file mode 100644 index 1fae43eb09..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - SDO 2.0.1 - - A schema that tests the presence of annotations in schema read by SDO - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml deleted file mode 100644 index c20c80b658..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd deleted file mode 100644 index bd3db2e030..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml deleted file mode 100644 index 30e4979dca..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd deleted file mode 100644 index e7738dcff7..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml deleted file mode 100644 index 9552421e2d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd deleted file mode 100644 index c7b9655749..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml deleted file mode 100644 index 5e5e7fbd55..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd deleted file mode 100644 index 5c455c2ab5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml deleted file mode 100644 index 635e851632..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd deleted file mode 100644 index 004dab4fbb..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml deleted file mode 100644 index 136092951b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd deleted file mode 100644 index 796f08e1cf..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml deleted file mode 100644 index 927b94885c..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd deleted file mode 100644 index 93f83cd0a1..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml deleted file mode 100644 index ea7db70595..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd deleted file mode 100644 index c64323e7e1..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml deleted file mode 100644 index 85c7d85fd4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd deleted file mode 100644 index 543f276c50..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml deleted file mode 100644 index fcd281539b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd deleted file mode 100644 index 1610c2b861..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml deleted file mode 100644 index 36a0760a61..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - anySimpleType - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd deleted file mode 100644 index 999b72bb35..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml deleted file mode 100644 index 5849165fe0..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd deleted file mode 100644 index 71dad561ca..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml deleted file mode 100644 index 8acf9376d7..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - http://tempuri.org - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd deleted file mode 100644 index a49987c352..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml deleted file mode 100644 index a35b6e174a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ABCDEF - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd deleted file mode 100644 index e1995890f9..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml deleted file mode 100644 index 91cfce51b8..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - true - false - 1 - 0 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd deleted file mode 100644 index a2f86ba8c5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml deleted file mode 100644 index 907474cd1b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 127 - -127 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd deleted file mode 100644 index a2f6bcfa77..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml deleted file mode 100644 index c5820e1a2e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 2001-01-01 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd deleted file mode 100644 index f4d596bfe3..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml deleted file mode 100644 index 0debe2fec5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 2001-12-31T12:00:00 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd deleted file mode 100644 index b5bcfdcfd4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml deleted file mode 100644 index 7f001254cc..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - -1.23456789 - 1.23456789 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd deleted file mode 100644 index 8d4d106f59..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml deleted file mode 100644 index f875b9f94d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 0.0 - 12.3E-4 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd deleted file mode 100644 index 4c8a39b06c..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml deleted file mode 100644 index 7d343d6dda..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - P1D - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd deleted file mode 100644 index bb12bc04a9..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml deleted file mode 100644 index 7a81f3b0dd..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 0.0 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd deleted file mode 100644 index f0e1c21233..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml deleted file mode 100644 index d35568b3c9..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ---01 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd deleted file mode 100644 index 92bd9a4b66..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml deleted file mode 100644 index 52cdfa8c4e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - --01-- - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd deleted file mode 100644 index 78d001a585..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml deleted file mode 100644 index 2609a858f7..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - --01-01 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd deleted file mode 100644 index 38f6c55059..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml deleted file mode 100644 index 7868a47ca3..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 2001 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd deleted file mode 100644 index 0d65b124ff..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml deleted file mode 100644 index 3f5080d49f..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 2001-01 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd deleted file mode 100644 index 340555dc5f..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml deleted file mode 100644 index 0deb7af980..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 0F00 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd deleted file mode 100644 index 8059fe6da0..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml deleted file mode 100644 index 06c92ce19b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - idvalue0 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd deleted file mode 100644 index 7b1f02d1d4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml deleted file mode 100644 index 9bc0cefd0f..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - idvalue0 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd deleted file mode 100644 index 0c207983bc..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml deleted file mode 100644 index f91b602f99..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - idvalue0 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd deleted file mode 100644 index b99bf01b73..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml deleted file mode 100644 index c99698e175..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - -2147483648 - 2147483647 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd deleted file mode 100644 index b5b9b0d1eb..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml deleted file mode 100644 index 80d22ce057..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - -2147483648 - 2147483647 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd deleted file mode 100644 index 4902935db5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml deleted file mode 100644 index 664bf824b4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - EN - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd deleted file mode 100644 index 5d3658d224..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml deleted file mode 100644 index c5861fa92a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - -9223372036854775808 - 9223372036854775807 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd deleted file mode 100644 index 0aa4710057..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml deleted file mode 100644 index 1f95950394..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - NCName - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd deleted file mode 100644 index 6ee9c435db..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml deleted file mode 100644 index 0297f1aeb4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - NMTOKEN - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd deleted file mode 100644 index 56d027bdbb..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml deleted file mode 100644 index 81ba1069bd..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - NMTOKENS - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd deleted file mode 100644 index 866ab73024..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml deleted file mode 100644 index 8bb3a08b94..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - tns:BuiltInNotationNotation - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd deleted file mode 100644 index c7c62f812b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml deleted file mode 100644 index 8235718c5e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - Name - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd deleted file mode 100644 index 36caba2f16..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml deleted file mode 100644 index 599c428a44..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - -1 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd deleted file mode 100644 index 389d5a99f0..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml deleted file mode 100644 index 919c4a20ee..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 0 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd deleted file mode 100644 index 59887078b5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml deleted file mode 100644 index 79011f26ab..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - -1 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd deleted file mode 100644 index 5de7d64d7b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml deleted file mode 100644 index c40be9e18b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - normalizedString - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd deleted file mode 100644 index d4a78787b8..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml deleted file mode 100644 index c30434de66..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 1 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd deleted file mode 100644 index 5381590cd1..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml deleted file mode 100644 index 4cd6ea7e72..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - QName - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd deleted file mode 100644 index e8faf6225b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml deleted file mode 100644 index b4375467c4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - -32768 - 32767 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd deleted file mode 100644 index a4f564d9b7..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml deleted file mode 100644 index d30ab85530..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - string - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd deleted file mode 100644 index 8abb34b5a5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml deleted file mode 100644 index 7fd9a061ae..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd deleted file mode 100644 index 1615976813..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml deleted file mode 100644 index cd567ba528..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - token - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd deleted file mode 100644 index 0beaac571f..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml deleted file mode 100644 index 025362defb..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 0 - 255 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd deleted file mode 100644 index d6d951fe5d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml deleted file mode 100644 index 5736a8c121..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 0 - 4294967295 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd deleted file mode 100644 index 242be1d53b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml deleted file mode 100644 index d728115a77..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 0 - 18446744073709551615 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd deleted file mode 100644 index 108e3a8619..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml deleted file mode 100644 index d4ffae5e17..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 0 - 65535 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd deleted file mode 100644 index 5ee5e0229e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml deleted file mode 100644 index 3d5aed5aa8..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd deleted file mode 100644 index e7b80ab11c..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml deleted file mode 100644 index 2b4fe5594e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - SimpleTypeWithName - SimpleTypeWithNameExtended - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd deleted file mode 100644 index fc4deb63c2..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml deleted file mode 100644 index 03570f41d9..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ComplexTypeExtendingSimpeTypeElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd deleted file mode 100644 index c754502645..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml deleted file mode 100644 index 4603793bfc..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ComplexTypeSimpleContentRestrictingComplexTypeElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd deleted file mode 100644 index 4bcd2f8c46..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml deleted file mode 100644 index a6861f803a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - BaseElement - ExtensionElement - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd deleted file mode 100644 index 8bb251cab2..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml deleted file mode 100644 index 467ec007ed..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - Some - ]]> - Mixed - SimpleType]]>WithName - Content - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd deleted file mode 100644 index 8d00646678..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml deleted file mode 100644 index 7deafd798a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd deleted file mode 100644 index 72ac75fee0..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml deleted file mode 100644 index f6208f81b3..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Some - Mixed - SimpleTypeWithName - Content - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd deleted file mode 100644 index 1f26e13673..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml deleted file mode 100644 index 97de7b98eb..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd deleted file mode 100644 index 67716553d8..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml deleted file mode 100644 index 5941348921..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - Some - Mixed - SimpleTypeWithName - Content - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd deleted file mode 100644 index 24d5d09054..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml deleted file mode 100644 index f684d06a4d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - SomeData - - - idvalue2 - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd deleted file mode 100644 index de4a8a666d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml deleted file mode 100644 index 242908bd27..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd deleted file mode 100644 index 4c00fbe295..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml deleted file mode 100644 index 925e8625d5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd deleted file mode 100644 index b12bec040b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml deleted file mode 100644 index c73708ce46..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd deleted file mode 100644 index 795c3ea7d9..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml deleted file mode 100644 index 3ebdc89ae0..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd deleted file mode 100644 index 21546d0f67..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml deleted file mode 100644 index 89657e42ca..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd deleted file mode 100644 index d01b4172e4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml deleted file mode 100644 index 82fd1eedaf..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd deleted file mode 100644 index e1dcf06194..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml deleted file mode 100644 index ebf03c9d5d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - ElementInAllOne - ElementInAllTwo - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd deleted file mode 100644 index 8b9ba5b4b8..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml deleted file mode 100644 index 26466b1b39..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Element1InChoice - Element2InChoice - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd deleted file mode 100644 index ff418c56ab..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml deleted file mode 100644 index 27bb1ce9cc..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - ChangeSummaryText - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd deleted file mode 100644 index 2bf1df8c99..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml deleted file mode 100644 index 9b5561ed43..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementOfSimpleTypeWithDefaultDefault - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd deleted file mode 100644 index 0b4e7bdf45..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml deleted file mode 100644 index f1b7cd264c..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementOfSimpleTypeWithFixedFixed - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd deleted file mode 100644 index a2c8456257..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml deleted file mode 100644 index 1f60b0423f..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementOfSimpleTypeWithSDODataTypeElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd deleted file mode 100644 index 21e55ab8c1..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml deleted file mode 100644 index 30762f4912..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - idvalue0 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd deleted file mode 100644 index 5bf35d0d70..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml deleted file mode 100644 index 2dd01e4090..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - idvalue0 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd deleted file mode 100644 index 6920cd8dd0..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml deleted file mode 100644 index 6a526bdc47..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementOfSimpleTypeWithSDOStringElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd deleted file mode 100644 index 1117a95eb8..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml deleted file mode 100644 index ab91458bff..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - ElementInSubstitutionGroupBase - - - - Some Data - - - - ElementInSubstitutionGroupBase - - - ElementInSubstitutionGroupExtends - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd deleted file mode 100644 index 3e015843b5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml deleted file mode 100644 index b6d68fd08a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - ElementWithMaxOccursElement1 - ElementWithMaxOccursElement2 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd deleted file mode 100644 index d4453a4477..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml deleted file mode 100644 index 6de3adc937..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementWithNillableElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd deleted file mode 100644 index 786ab226da..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml deleted file mode 100644 index 64093aa803..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementWithSDOAliasName - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd deleted file mode 100644 index 01f4c2b1ef..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml deleted file mode 100644 index 774646f682..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementWithSDONameElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd deleted file mode 100644 index 34da37564c..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml deleted file mode 100644 index a1fb3aa803..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd deleted file mode 100644 index 8eb7a4fce4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml deleted file mode 100644 index f68eb1939d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - GlobalElementSimpleType - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd deleted file mode 100644 index b9f77e6658..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xml deleted file mode 100644 index fd28850050..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - SimpleTypeWithName - - SomeString - SomeString - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xsd deleted file mode 100644 index eae93fd44a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Import.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd deleted file mode 100644 index a7e568decf..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xml deleted file mode 100644 index d4b9e24fa6..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xsd deleted file mode 100644 index 34ff314a19..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Include.xsd +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd deleted file mode 100644 index ae22ab2c44..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xml deleted file mode 100644 index b75ac6500a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - -tns:Tuscany - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd deleted file mode 100644 index 6ad019cb81..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Person.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Person.xsd deleted file mode 100644 index 5f5021b15e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/Person.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml deleted file mode 100644 index 6c5ad88ff4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd deleted file mode 100644 index 6b7e39b334..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml deleted file mode 100644 index f9d4a24a49..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithAbstractExtensionElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd deleted file mode 100644 index f649e2ba83..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml deleted file mode 100644 index 410df4b7e4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithExtendedInstanceClassElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd deleted file mode 100644 index 5d27ef5ce1..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml deleted file mode 100644 index 7b74867c03..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithInstanceClassElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd deleted file mode 100644 index ec16a678a3..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml deleted file mode 100644 index 708d526f44..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - listmember1 listmember2 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd deleted file mode 100644 index ed681009f9..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml deleted file mode 100644 index e404ac86b7..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithNameElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd deleted file mode 100644 index af0431f048..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml deleted file mode 100644 index c86a0f6bcb..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithSDONameElement - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd deleted file mode 100644 index 89b00a36cc..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml deleted file mode 100644 index 399b0d8175..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - EN - 01:02:03 - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd deleted file mode 100644 index ea35bec61a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml deleted file mode 100644 index bc8cf35368..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithoutName - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd deleted file mode 100644 index 57981e3666..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml deleted file mode 100644 index da2929776e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd deleted file mode 100644 index ace5427786..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd deleted file mode 100644 index e6b9697a8d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Expected type is emof:Package. - - - - - - - - - - - Expected type is xsd:schema. - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd deleted file mode 100644 index 7387568942..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd deleted file mode 100644 index c5aabc9cc8..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/tags/java/sca/1.5.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java deleted file mode 100644 index fa3f310d4d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.generate; - -import junit.framework.TestCase; - - -/** - * - */ -public class GenerateTestCase extends TestCase { - - //private Generate generator = null; - - @Override - protected void setUp() throws Exception { - //generator = new Generate(); - } - - @Override - protected void tearDown() { - } - - /** - * Invokes the Generate class to generate databinding test classes and resources. - * - * @throws Exception - */ - public void testGenerate() throws Exception { - //generator.generate(); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/config.png b/tags/java/sca/1.5.1/itest/databindings/config.png deleted file mode 100644 index 7912019e9d..0000000000 Binary files a/tags/java/sca/1.5.1/itest/databindings/config.png and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/databindings/config.svg b/tags/java/sca/1.5.1/itest/databindings/config.svg deleted file mode 100644 index aaf027e2df..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/config.svg +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - image/svg+xml - - - - - - <tns:Generate ...> <Template> <TemplateName>greeter.composite.vm</TemplateName> <TemplateTargetDir>classes</TemplateTargetDir> </Template> ... <InputFile> <FileName>Person.xsd</FileName> <FilePath>xsd</FilePath> <JavaPackage>org.apache.tuscany.sca.itest.databinding.types</JavaPackage> <Factory>TypesFactory</Factory> <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace> <Prefix>p</Prefix> <Type> <TypeName>PersonType</TypeName> <CreateTypeCode> TypesFactory factory = TypesFactory.INSTANCE; param = factory.createPersonType(); param.setFirstName("George"); param.setLastName("Doors"); </CreateTypeCode> <ModifyTypeCode> param.setGreeting("Hello"); </ModifyTypeCode> <ResultComparison> assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting()); </ResultComparison> </Type> </InputFile> ...</tns:Generate> - diff --git a/tags/java/sca/1.5.1/itest/databindings/databinding.png b/tags/java/sca/1.5.1/itest/databindings/databinding.png deleted file mode 100644 index 76a9c71b7d..0000000000 Binary files a/tags/java/sca/1.5.1/itest/databindings/databinding.png and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/databindings/databinding.svg b/tags/java/sca/1.5.1/itest/databindings/databinding.svg deleted file mode 100644 index d6850ccf7d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/databinding.svg +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - GreeterService - - DefaultGreeterServiceClient - - - GreeterServiceComponent - - WSGreeterServiceClient - - - - - WSReference WSService - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/interop.png b/tags/java/sca/1.5.1/itest/databindings/interop.png deleted file mode 100644 index 005e0f24ea..0000000000 Binary files a/tags/java/sca/1.5.1/itest/databindings/interop.png and /dev/null differ diff --git a/tags/java/sca/1.5.1/itest/databindings/interop.svg b/tags/java/sca/1.5.1/itest/databindings/interop.svg deleted file mode 100644 index 03897c6d09..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/interop.svg +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - InteropGreeterService - - SDODefaultGreeterServiceClient - - - SDOGreeterServiceComponent - - SDOWSGreeterServiceClient - - - - WSReference WSService - JAXBDefaultGreeterServiceClient - - - JAXBWSGreeterServiceClient - - - - WSReference WSService - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/interop/pom.xml b/tags/java/sca/1.5.1/itest/databindings/interop/pom.xml deleted file mode 100644 index fd4bc7c0a5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/interop/pom.xml +++ /dev/null @@ -1,223 +0,0 @@ - - - - - org.apache.tuscany.sca - itest-databindings - 1.5.1 - - - 4.0.0 - - itest-databindings-interop - 1.5.1 - jar - Apache Tuscany SCA iTest DataBinding Interop - - - - - true - - java.net - java.net Maven 1.x Repository - http://download.java.net/maven/1 - legacy - - - java.net2 - java.net Maven 2.x Repository - http://download.java.net/maven/2 - - - - - - - true - - java.net - java.net Maven 1.x Repository - http://download.java.net/maven/1 - legacy - - - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-databinding-jaxb - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-databinding-sdo - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-databinding-axiom - ${pom.version} - compile - - - javax.xml.bind - jaxb-api - 2.1 - compile - - - - com.sun.xml.ws - jaxws-rt - 2.1.3 - - - org.apache.tuscany.sca - itest-databindings-common - ${pom.version} - compile - - - org.apache.tuscany.sca - itest-databindings-sdo - ${pom.version} - compile - - - org.apache.tuscany.sca - itest-databindings-jaxb - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-host-embedded - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-interface-java-xml - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.5.1 - test - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Djava.endorsed.dirs=target/endorsed - - - - org.apache.maven.plugins - maven-dependency-plugin - - - generate-sources - - unpack - - - - - org.apache.tuscany.sca - itest-databindings-common - ${project.version} - true - ${project.build.directory}/classes - - - - - - copy - generate-sources - - copy - - - - - javax.xml.ws - jaxws-api - 2.1 - jar - - - javax.xml.bind - jaxb-api - 2.1 - jar - - - ${project.build.directory}/endorsed - false - true - - - - - - org.codehaus.mojo - exec-maven-plugin - - - generate-test-source - process-resources - - java - - - - - org.apache.tuscany.sca.itest.generate.Generate - - ${project.build.directory} - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm deleted file mode 100644 index 7bdfc57924..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm +++ /dev/null @@ -1,113 +0,0 @@ -/* - * 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 $template.getJavaPackage(); - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import ${template.getJavaPackage()}.GreeterService; - -// Data types -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) -import $file.getJavaPackage().$typeInstance.getTypeName(); -import $file.getJavaPackage().$file.getFactory(); -#end -#end - -/** - * Automatically generated test case. Calls the greeter client for a number of - * bindings and a number of data types. - * - * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $ - */ -public class InteropDatabindingTestCase extends TestCase { - - private static boolean initalised = false; - private GreeterService greeterClient; - private static SCADomain domain; - - /** - * Runs before each test method - */ - protected void setUp() throws Exception { - if (!initalised) { - domain = SCADomain.newInstance("interopgreeter.composite"); - super.setUp(); - initalised = true; - } - } - - /** - * Runs after each test method - */ - protected void tearDown() { - - } - - /** - * Finds the SCA component that relates to the protocol being tested. This test - * always connects locally to the client component but the client component will - * connect to the back end component using the appropriate protocol - * - * @param ext the protcol required - */ - private void setUpClient(String ext) throws Exception { - greeterClient = domain.getService(GreeterService.class, "SDO" + ext + "GreeterServiceClient"); - } - - /** - * Invokes the SDO Greet service using web service bindings with SDO payload - */ - public void testWSGreet() throws Exception { - setUpClient("WS"); - greet(); - } - - /** - * Invokes the SDO Greet service using default bindings with SDO payload - */ - public void testDefaultGreet() throws Exception { - setUpClient("Default"); - greet(); - } - - /** - * A generic method which, regarless of which client is connected, sends out a - * series of requrests passing different data types. - */ - public void greet() { -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - // test $typeInstance.getTypeName() - { - $typeInstance.getTypeName() param = null; - $typeInstance.getCreateTypeCode() - $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param); - $typeInstance.getResultComparison() - } -#end -#end - } - -} diff --git a/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm deleted file mode 100644 index 38bfccce0c..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - -#foreach($file in $fileList) - -#end - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - - - - -#end -#end - - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - - - - -#end -#end - - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - -#end -#end - - - - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - - - - - - -#end -#end - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm deleted file mode 100644 index 6f02af4c9d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - -#foreach($file in $fileList) - -#end - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - - - - -#end -#end - - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - - - - -#end -#end - - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - -#end -#end - - - - -#foreach($file in $fileList) -#set($typeList = $file.getType_()) -#foreach($typeInstance in $typeList) - - - - - - - - - -#end -#end - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/generate.xml b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/generate.xml deleted file mode 100644 index 8453dd56b4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/generate.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - Person.xsd - xsd - org.apache.tuscany.sca.itest.databinding.types - TypesFactory - http://apache.org/tuscany/sca/itest/databinding/types - p - - PersonType - - TypesFactory factory = TypesFactory.INSTANCE; - param = factory.createPersonType(); - param.setFirstName("George"); - param.setLastName("Doors"); - - - param.setGreeting("Hello"); - - - assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting()); - - - - - Interop.xsd - xsd - org.apache.tuscany.interop - InteropFactory - http://www.apache.org/tuscany/interop - i - - - AttributeComplexType - - InteropFactory factory = InteropFactory.INSTANCE; - org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType(); - attrib.setAttribute("SomeText"); - param = factory.createAttributeComplexType(); - param.setAttributeElement(attrib); - - - param.getAttributeElement().setAttribute("SomeChangedText");; - - - assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute()); - - - - AttributeReferenceComplexType - - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createAttributeReferenceComplexType(); - - param.setReferencedAttribute("SomeText"); - - - param.setReferencedAttribute("SomeChangedText");; - - - assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute()); - - - - SimpleTypeWithAbstractComplexType - - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createSimpleTypeWithAbstractComplexType(); - param.setSimpleTypeWithAbstractExtensionElement("SomeText"); - - - param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");; - - - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement()); - - - - SimpleTypeWithNameComplexType - - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createSimpleTypeWithNameComplexType(); - param.setSimpleTypeWithNameElement("SomeText"); - - - param.setSimpleTypeWithNameElement("SomeChangedText");; - - - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement()); - - - - ComplexTypeWithContentType - - InteropFactory factory = InteropFactory.INSTANCE; - param = factory.createComplexTypeWithContentType(); - param.setSimpleTypeWithName("SomeText"); - - - param.setSimpleTypeWithName("SomeChangedText");; - - - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName()); - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm deleted file mode 100644 index 36797fde57..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - #foreach( $file in $fileList ) - - #end - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/pom.xml b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/pom.xml deleted file mode 100644 index c4e60ddc5b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/pom.xml +++ /dev/null @@ -1,239 +0,0 @@ - - - - - org.apache.tuscany.sca - itest-databindings - 1.5.1 - - - 4.0.0 - - itest-databindings-jaxb-bottom-up - 1.5.1 - jar - Apache Tuscany SCA iTest Databinding - JAXB Bottom Up - - - - - true - - java.net - java.net Maven 1.x Repository - http://download.java.net/maven/1 - legacy - - - java.net2 - java.net Maven 2.x Repository - http://download.java.net/maven/2 - - - - - - java.net2 - java.net Maven 2.x Repository - http://download.java.net/maven/2 - - - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - ${pom.version} - runtime - - - org.apache.tuscany.sca - tuscany-databinding-jaxb - ${pom.version} - runtime - - - org.apache.tuscany.sca - tuscany-databinding-sdo - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-databinding-axiom - ${pom.version} - compile - - - org.apache.tuscany.sca - itest-databindings-common - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-host-embedded - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-interface-java-xml - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.5.1 - runtime - - - javax.xml.bind - jaxb-api - 2.1 - compile - - - - com.sun.xml.ws - jaxws-rt - 2.1.3 - - - - commons-collections - commons-collections - 3.1 - - - log4j - log4j - 1.2.12 - provided - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Djava.endorsed.dirs=target/endorsed - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - generate-sources - - copy - - - - - javax.xml.ws - jaxws-api - 2.1 - jar - - - javax.xml.bind - jaxb-api - 2.1 - jar - - - ${project.build.directory}/endorsed - false - true - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java deleted file mode 100644 index 7f9b62f9b4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.databindings.jaxb; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for AClientService. - */ -@Remotable -public interface AClientService { - public String getGreetingsForward(String name); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java deleted file mode 100644 index 1762812c1f..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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.databindings.jaxb; - -import javax.jws.soap.SOAPBinding; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for AService. - */ -@Remotable -@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) -public interface AService { - public String getGreetings(String name); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java deleted file mode 100644 index 7529c2b841..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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.databindings.jaxb; - -/** - * @version $Rev$ $Date$ - */ -public class Bean1 { - private T item; - - public Bean1() { - } - - public Bean1(T item) { - this.item = item; - } - - public void setItem(T item) { - this.item = item; - } - - public T getItem() { - return item; - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } - if(that.getClass() != this.getClass()) { - return false; - } - - Bean1 that1 = (Bean1)that; - if(this == that1) { - return true; - } else if(this.item != null) { - return this.item.equals(that1.item); - } else { - return that1.item == null; - } - } - - public String toString() { - return this.getClass().getSimpleName()+"[item = "+item+"]"; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java deleted file mode 100644 index 4a4419a42b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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.databindings.jaxb; - -/** - * @version $Rev$ $Date$ - */ -public class Bean10 extends Bean1 { -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java deleted file mode 100644 index 65f019ec48..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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.databindings.jaxb; - -/** - * @version $Rev$ $Date$ - */ -public class Bean11 extends Bean1 { -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java deleted file mode 100644 index 844e28863a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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.databindings.jaxb; - -/** - * @version $Rev$ $Date$ - */ -public class Bean2 { - private String name; - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } - - if(this.getClass() != that.getClass()) { - return false; - } - - if(this == that) { - return true; - } else if(this.name != null) { - return this.name.equals(((Bean2)that).name); - } else { - return ((Bean2)that).name == null; - } - } - - public String toString() { - return this.getClass().getSimpleName()+"[name = "+name+"]"; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java deleted file mode 100644 index 4e0bd38b2b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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.databindings.jaxb; - -/** - * @version $Rev$ $Date$ - */ -public class Bean3 extends Bean2 { - private String address; - - public void setAddress(String address) { - this.address = address; - } - - public String getAddress() { - return address; - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } - - if(this.getClass() != that.getClass()) { - return false; - } - - if(this == that) { - return true; - } else if(this.address != null) { - return this.address.equals(((Bean3)that).address) && super.equals(that); - } else { - return ((Bean3)that).address == null && super.equals(that); - } - } - - public String toString() { - return this.getClass().getSimpleName()+"[name = "+super.getName()+", address = "+address+"]"; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java deleted file mode 100644 index 40aff31297..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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.databindings.jaxb; - -/** - * @version $Rev$ $Date$ - */ -public class Bean31 extends Bean2 { - private String address; - - public void setAddress(String address) { - this.address = address; - } - - public String getAddress() { - return address; - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } - - if(this.getClass() != that.getClass()) { - return false; - } - - if(this == that) { - return true; - } else if(this.address != null) { - return this.address.equals(((Bean31)that).address) && super.equals(that); - } else { - return ((Bean31)that).address == null && super.equals(that); - } - } - - public String toString() { - return this.getClass().getSimpleName()+"[name = "+super.getName()+", address = "+address+"]"; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java deleted file mode 100644 index ca012b967d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.databindings.jaxb; - -/** - * The interface for GenericsLocalService. - * - * @version $Rev$ $Date$ - */ -public interface GenericsLocalService { - Bean1 getTypeExplicit(Bean1 arg); - - Bean1 getTypeUnbound(T[] anArray); - - Bean1 getTypeExtends(T[] anArray); - - > Bean1 getRecursiveTypeBound(T[] anArray); - - Bean1 getWildcardUnbound(Bean1 arg); - - Bean1 getWildcardSuper(Bean1 arg); - - Bean1 getWildcardExtends(Bean1 arg); - - Bean2 getPolymorphic(Bean2 arg); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java deleted file mode 100644 index 12ed7d0ec7..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.databindings.jaxb; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for GenericsService. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface GenericsService extends GenericsLocalService{ -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java deleted file mode 100644 index 3bae554dc7..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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.databindings.jaxb; - -/** - * The interface for GenericsServiceClient. - * - * @version $Rev$ $Date$ - */ -public interface GenericsServiceClient { - Bean1 getTypeExplicitForward(Bean1 arg); - - Bean1 getTypeUnboundForward(T[] anArray); - - Bean1 getTypeExtendsForward(T[] anArray); - - > Bean1 getRecursiveTypeBoundForward(T[] anArray); - - Bean1 getWildcardUnboundForward(Bean1 arg); - - Bean1 getWildcardSuperForward(Bean1 arg); - - Bean1 getWildcardExtendsForward(Bean1 arg); - - Bean2 getPolymorphicForward(Bean2 arg); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java deleted file mode 100644 index a31cc3d45a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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.databindings.jaxb; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * The interface for HelloLocalServiceSimple. - */ -public interface HelloLocalServiceSimple { - String getGreetings(String name); - String[] getGreetingsArray(String[] names); - List getGreetingsList(List names); - ArrayList getGreetingsArrayList(ArrayList names); - Map getGreetingsMap(Map namesMap); - HashMap getGreetingsHashMap(HashMap namesMap); - String getGreetingsVarArgs(String... names); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java deleted file mode 100644 index 34ac9024f6..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.databindings.jaxb; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for HelloServiceSimple. - */ -@Remotable -public interface HelloServiceSimple extends HelloLocalServiceSimple { - // Add any methods to the local interface. -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java deleted file mode 100644 index 23ed57dec9..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.databindings.jaxb; - -import java.util.ArrayList; -import java.util.List; -import java.util.HashMap; -import java.util.Map; - -/** - * The interface for HelloServiceSimpleClient. - */ -public interface HelloServiceSimpleClient { - String getGreetingsForward(String name); - String[] getGreetingsArrayForward(String[] names); - List getGreetingsListForward(List names); - ArrayList getGreetingsArrayListForward(ArrayList names); - Map getGreetingsMapForward(Map namesMap); - HashMap getGreetingsHashMapForward(HashMap namesMap); - String getGreetingsVarArgsForward(String... names); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java deleted file mode 100644 index 6239c0f5f1..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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.databindings.jaxb; - - -/** - * The interface for PrimitivesLocalService. - */ -public interface PrimitivesLocalService { - boolean negateBoolean(boolean flag); - boolean[] negateBooleanArray(boolean[] flags); - boolean[] identityBooleanArray(boolean[] flags); - byte negateByte(byte b); - byte[] negateByteArray(byte[] ba); - byte[] identityByteArray(byte[] ba); - short negateShort(short s); - short[] negateShortArray(short[] s); - short[] identityShortArray(short[] sa); - int negateInt(int s); - int[] negateIntArray(int[] s); - int[] identityIntArray(int[] ia); - long negateLong(long l); - long[] negateLongArray(long[] la); - long[] identityLongArray(long[] la); - float negateFloat(float f); - float[] negateFloatArray(float[] fa); - float[] identityFloatArray(float[] fa); - double negateDouble(double d); - double[] negateDoubleArray(double[] da); - double[] identityDoubleArray(double[] da); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java deleted file mode 100644 index c5553688e2..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.databindings.jaxb; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for PrimitivesService. - */ -@Remotable -public interface PrimitivesService extends PrimitivesLocalService { - // Add any methods to the local interface. -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java deleted file mode 100644 index 3bdf886dfa..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.databindings.jaxb; - - -/** - * The interface for PrimitivesServiceClient. - */ -public interface PrimitivesServiceClient { - boolean negateBooleanForward(boolean flag); - boolean[] negateBooleanArrayForward(boolean[] flags); - boolean passByValueBooleanArray(); - byte negateByteForward(byte b); - byte[] negateByteArrayForward(byte[] ba); - boolean passByValueByteArray(); - short negateShortForward(short s); - short[] negateShortArrayForward(short[] sa); - boolean passByValueShortArray(); - int negateIntForward(int i); - int[] negateIntArrayForward(int[] ia); - boolean passByValueIntArray(); - long negateLongForward(long l); - long[] negateLongArrayForward(long[] la); - boolean passByValueLongArray(); - float negateFloatForward(float f); - float[] negateFloatArrayForward(float[] fa); - boolean passByValueFloatArray(); - double negateDoubleForward(double d); - double[] negateDoubleArrayForward(double[] da); - boolean passByValueDoubleArray(); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java deleted file mode 100644 index 0fdf69459f..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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.databindings.jaxb; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - - -/** - * The interface for StandardTypesLocalService. - */ -public interface StandardTypesLocalService { - BigInteger getNewBigInteger(BigInteger bi); - BigInteger[] getNewBigIntegerArray(BigInteger[] bia); - - BigDecimal getNewBigDecimal(BigDecimal bd); - BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda); - - Calendar getNewCalendar(Calendar c); - Calendar[] getNewCalendarArray(Calendar[] ca); - - Date getNewDate(Date d); - Date[] getNewDateArray(Date[] da); - - QName getNewQName(QName qname); - QName[] getNewQNameArray(QName[] qnames); - - URI getNewURI(URI uri); - URI[] getNewURIArray(URI[] uris); - - XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal); - XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcal); - - Duration getNewDuration(Duration d); - Duration[] getNewDurationArray(Duration[] da); - - Object getNewObject(Object obj); - Object[] getNewObjectArray(Object[] objs); - - Image getNewImage(Image img); - Image[] getNewImageArray(Image[] imgs); - - DataHandler getNewDataHandler(DataHandler dh); - DataHandler[] getNewDataHandlerArray(DataHandler[] dha); - - Source getNewSource(Source src); - Source[] getNewSourceArray(Source[] srcs); - - UUID getNewUUID(UUID uuid); - UUID[] getNewUUIDArray(UUID[] uuids); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java deleted file mode 100644 index 2842205085..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.databindings.jaxb; - -import org.osoa.sca.annotations.Remotable; - - - -/** - * The interface for StandardTypesService. - */ -@Remotable -public interface StandardTypesService extends StandardTypesLocalService{ -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java deleted file mode 100644 index 351d9df0cb..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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.databindings.jaxb; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - - -/** - * The interface for StandardTypesServiceClient. - */ -public interface StandardTypesServiceClient { - BigInteger getNewBigIntegerForward(BigInteger bi); - BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia); - - BigDecimal getNewBigDecimalForward(BigDecimal bd); - BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda); - - Calendar getNewCalendarForward(Calendar c); - Calendar[] getNewCalendarArrayForward(Calendar[] ca); - - Date getNewDateForward(Date d); - Date[] getNewDateArrayForward(Date[] da); - - QName getNewQNameForward(QName qname); - QName[] getNewQNameArrayForward(QName[] qnames); - - URI getNewURIForward(URI uri); - URI[] getNewURIArrayForward(URI[] uris); - - XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal); - XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals); - - Duration getNewDurationForward(Duration d); - Duration[] getNewDurationArrayForward(Duration[] da); - - Object getNewObjectForward(Object obj); - Object[] getNewObjectArrayForward(Object[] objs); - - Image getNewImageForward(Image img); - Image[] getNewImageArrayForward(Image[] imgs); - - DataHandler getNewDataHandlerForward(DataHandler dh); - DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha); - - Source getNewSourceForward(Source src); - Source[] getNewSourceArrayForward(Source[] srcs); - - UUID getNewUUIDForward(UUID uuid); - UUID[] getNewUUIDArrayForward(UUID[] uuids); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java deleted file mode 100644 index 8b484e93f0..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.AClientService; -import org.apache.tuscany.sca.itest.databindings.jaxb.AService; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * This class implements AService. - */ -@Service(AClientService.class) -public class AClientServiceImpl implements AClientService { - - @Reference - protected AService aService; - - public String getGreetingsForward(String name) { - return aService.getGreetings(name); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java deleted file mode 100644 index 4a35d41c04..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.AService; -import org.osoa.sca.annotations.Service; - -/** - * This class implements AService. - */ -@Service(AService.class) -public class AServiceImpl implements AService { - - public String getGreetings(String name) { - return "Hello " + name; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java deleted file mode 100644 index 9e042ffe6a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3; -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of GenericsLocalServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - * - * @version $Rev$ $Date$ - */ -@Service(GenericsServiceClient.class) -public class GenericsLocalServiceClientImpl implements GenericsServiceClient { - - private GenericsLocalService service; - - @Reference(required=false) - protected void setGenericsLocalService(GenericsLocalService service) { - this.service = service; - } - - public Bean1 getTypeExplicitForward(Bean1 arg) { - return service.getTypeExplicit(arg); - } - - public Bean1 getTypeUnboundForward(T[] anArray) { - return service.getTypeUnbound(anArray); - } - - public Bean1 getTypeExtendsForward(T[] anArray) { - return service.getTypeExtends(anArray); - } - - public > Bean1 getRecursiveTypeBoundForward(T[] anArray) { - return service.getRecursiveTypeBound(anArray); - } - - public Bean1 getWildcardUnboundForward(Bean1 arg) { - return service.getWildcardUnbound(arg); - } - - public Bean1 getWildcardSuperForward(Bean1 arg) { - return service.getWildcardSuper(arg); - } - - public Bean1 getWildcardExtendsForward(Bean1 arg) { - return service.getWildcardExtends(arg); - } - - public Bean2 getPolymorphicForward(Bean2 arg) { - return service.getPolymorphic(arg); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java deleted file mode 100644 index ec929ddece..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService; -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of GenericsServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - * - * @version $Rev$ $Date$ - */ -@Service(GenericsServiceClient.class) -public class GenericsServiceClientImpl extends GenericsLocalServiceClientImpl { - - @Reference - public void setGenericsService(GenericsService service) { - super.setGenericsLocalService(service); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java deleted file mode 100644 index 58808eec4f..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3; -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of GenericsService. - * This implementation provides both a local and a remotable service. - * - * @version $Rev$ $Date$ - */ -@Service(interfaces={GenericsService.class, GenericsLocalService.class}) -public class GenericsServiceImpl implements GenericsService, GenericsLocalService { - - public Bean1 getTypeExplicit(Bean1 arg) { - return GenericsTransformer.getTypeExplicit(arg); - } - - public Bean1 getTypeUnbound(T[] anArray) { - return GenericsTransformer.getTypeUnbound(anArray); - } - - public Bean1 getTypeExtends(T[] anArray) { - return GenericsTransformer.getTypeExtends(anArray); - } - - public > Bean1 getRecursiveTypeBound(T[] anArray) { - return GenericsTransformer.getRecursiveTypeBound(anArray); - } - - public Bean1 getWildcardUnbound(Bean1 arg) { - return GenericsTransformer.getWildcardUnbound(arg); - } - - public Bean1 getWildcardSuper(Bean1 arg) { - return GenericsTransformer.getWildcardSuper(arg); - } - - public Bean1 getWildcardExtends(Bean1 arg) { - return GenericsTransformer.getWildcardExtends(arg); - } - - public Bean2 getPolymorphic(Bean2 arg) { - return GenericsTransformer.getPolymorphic(arg); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java deleted file mode 100644 index 858b8da59a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean10; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean11; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean31; - - -/** - * GenericsTransformer class that provide for transforming input provided to GenericsService methods. - * - * @version $Rev$ $Date$ - */ -public class GenericsTransformer { - - public static Bean1 getTypeExplicit(Bean1 arg) { - return new Bean1(arg.getItem() == null ? null : arg.getItem()+" AA"); - } - - public static Bean1 getTypeUnbound(T[] arg) { - if(arg instanceof String[]) { - return new Bean1(arg[0]); - } else if(arg instanceof Integer[]){ - return new Bean1(arg[1]); - } else { - return new Bean1(arg[2]); - } - } - - public static Bean1 getTypeExtends(T[] arg) { - if(arg instanceof Bean3[]) { - return new Bean1(arg[0]); - } else if(arg instanceof Bean31[]) { - return new Bean1(arg[1]); - } else { - return new Bean1(arg[2]); - } - } - - public static > Bean1 getRecursiveTypeBound(T[] arg) { - if(arg instanceof Bean10[]) { - return new Bean1(arg[0]); - } else if(arg instanceof Bean11[]) { - return new Bean1(arg[1]); - } else { - return new Bean1(arg[2]); - } - } - - public static Bean1 getWildcardUnbound(Bean1 arg) { - if(arg.getItem() instanceof String) { - Bean1 temp = new Bean1(); - temp.setItem("Hello "+arg.getItem()); - return temp; - } else if(arg.getItem() instanceof Integer) { - Bean1 temp = new Bean1(); - temp.setItem(10+(Integer)arg.getItem()); - return temp; - } else { - return new Bean1(arg.toString()); - } - } - - public static Bean1 getWildcardSuper(Bean1 arg) { - Object item = arg.getItem(); - if(item instanceof Bean3) { - Bean3 temp = new Bean3(); - temp.setName("Hello " + ((Bean3)item).getName()); - temp.setAddress("New "+((Bean3)item).getAddress()); - return new Bean1(temp); - } else if(item instanceof Bean2) { - Bean2 temp = new Bean2(); - temp.setName("Hello " + ((Bean3)item).getName()); - return new Bean1(temp); - } else { - Bean2 temp = new Bean2(); - temp.setName(item.toString()); - return new Bean1(temp); - } - } - - public static Bean1 getWildcardExtends(Bean1 arg) { - Bean2 item = arg.getItem(); - if(item instanceof Bean3) { - Bean3 temp = new Bean3(); - temp.setName("Hello "+item.getName()); - temp.setAddress("New "+((Bean3)item).getAddress()); - return new Bean1(temp); - } else if(item instanceof Bean31) { - Bean31 temp = new Bean31(); - temp.setName("Hello "+item.getName()); - temp.setAddress("New "+((Bean31)item).getAddress()); - return new Bean1(temp); - } else { - Bean2 temp = new Bean2(); - temp.setName("Hello "+item.getName()); - return new Bean1(temp); - } - } - - public static Bean2 getPolymorphic(Bean2 arg) { - return arg; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java deleted file mode 100644 index 51e48edbc9..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import java.util.ArrayList; -import java.util.List; -import java.util.HashMap; -import java.util.Map; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple; -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of HelloServiceSimpleClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(HelloServiceSimpleClient.class) -public class HelloLocalServiceSimpleClientImpl implements HelloServiceSimpleClient { - - private HelloLocalServiceSimple service; - - @Reference(required=false) - protected void setHelloLocalServiceSimple(HelloLocalServiceSimple service) { - this.service = service; - } - - public String getGreetingsForward(String name) { - return service.getGreetings(name); - } - - public String[] getGreetingsArrayForward(String[] names) { - return service.getGreetingsArray(names); - } - - public List getGreetingsListForward(List names) { - return service.getGreetingsList(names); - } - - public Map getGreetingsMapForward(Map namesMap) { - return service.getGreetingsMap(namesMap); - } - - public ArrayList getGreetingsArrayListForward(ArrayList names) { - return service.getGreetingsArrayList(names); - } - - public HashMap getGreetingsHashMapForward(HashMap namesMap) { - return service.getGreetingsHashMap(namesMap); - } - - public String getGreetingsVarArgsForward(String... names) { - return service.getGreetingsVarArgs(names[0], names[1], names[2]); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java deleted file mode 100644 index de52cdfac3..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple; -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of HelloServiceSimpleClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(HelloServiceSimpleClient.class) -public class HelloServiceSimpleClientImpl extends HelloLocalServiceSimpleClientImpl { - - @Reference - public void setHelloServiceSimple(HelloServiceSimple service) { - super.setHelloLocalServiceSimple(service); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java deleted file mode 100644 index 199335c38c..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple; -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of HelloServiceSimple. - * The implementation provides both a local and a remotable service. - */ -@Service(interfaces = {HelloServiceSimple.class, HelloLocalServiceSimple.class}) -public class HelloServiceSimpleImpl implements HelloServiceSimple { - public String getGreetings(String name) { - return "Hello " + name; - } - - public String[] getGreetingsArray(String[] names) { - String[] resps = new String[names.length]; - for (int i = 0; i < names.length; ++i) { - resps[i] = "Hello " + names[i]; - } - return resps; - } - - public List getGreetingsList(List names) { - List resps = new ArrayList(); - for (int i = 0; i < names.size(); ++i) { - resps.add("Hello " + names.get(i)); - } - return resps; - } - - public ArrayList getGreetingsArrayList(ArrayList names) { - ArrayList resps = new ArrayList(); - for (int i = 0; i < names.size(); ++i) { - resps.add("Hello " + names.get(i)); - } - return resps; - } - - public Map getGreetingsMap(Map namesMap) { - for (Map.Entry entry : namesMap.entrySet()) { - entry.setValue("Hello " + entry.getKey()); - } - return namesMap; - } - - public HashMap getGreetingsHashMap(HashMap namesMap) { - for (Map.Entry entry : namesMap.entrySet()) { - entry.setValue("Hello " + entry.getKey()); - } - return namesMap; - } - - public String getGreetingsVarArgs(String... names) { - String resp = "Hello"; - for(int i = 0; i < names.length; ++i) { - resp += (" "+names[i]); - } - return resp; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java deleted file mode 100644 index fe9121be9d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of PrimitivesLocalServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(PrimitivesServiceClient.class) -public class PrimitivesLocalServiceClientImpl implements PrimitivesServiceClient { - - private PrimitivesLocalService service; - - @Reference(required=false) - protected void setPrimitivesLocalService(PrimitivesLocalService service) { - this.service = service; - } - - public boolean negateBooleanForward(boolean flag) { - return service.negateBoolean(flag); - } - - public boolean[] negateBooleanArrayForward(boolean[] flags) { - return service.negateBooleanArray(flags); - } - - public boolean passByValueBooleanArray() { - boolean[] req = new boolean[2]; - boolean[] resp = service.identityBooleanArray(req); - return req != resp; - } - - public byte negateByteForward(byte b) { - return service.negateByte(b); - } - - public byte[] negateByteArrayForward(byte[] ba) { - return service.negateByteArray(ba); - } - - public boolean passByValueByteArray() { - byte[] req = new byte[2]; - byte[] resp = service.identityByteArray(req); - return req != resp; - } - - public short negateShortForward(short s) { - return service.negateShort(s); - } - - public short[] negateShortArrayForward(short[] s) { - return service.negateShortArray(s); - } - - public boolean passByValueShortArray() { - short[] req = new short[2]; - short[] resp = service.identityShortArray(req); - return req != resp; - } - - public int negateIntForward(int i) { - return service.negateInt(i); - } - - public int[] negateIntArrayForward(int[] ia) { - return service.negateIntArray(ia); - } - - public boolean passByValueIntArray() { - int[] req = new int[2]; - int[] resp = service.identityIntArray(req); - return req != resp; - } - - public long negateLongForward(long l) { - return service.negateLong(l); - } - - public long[] negateLongArrayForward(long[] la) { - return service.negateLongArray(la); - } - - public boolean passByValueLongArray() { - long[] req = new long[2]; - long[] resp = service.identityLongArray(req); - return req != resp; - } - - public float negateFloatForward(float f) { - return service.negateFloat(f); - } - - public float[] negateFloatArrayForward(float[] fa) { - return service.negateFloatArray(fa); - } - - public boolean passByValueFloatArray() { - float[] req = new float[2]; - float[] resp = service.identityFloatArray(req); - return req != resp; - } - - public double negateDoubleForward(double d) { - return service.negateDouble(d); - } - - public double[] negateDoubleArrayForward(double[] da) { - return service.negateDoubleArray(da); - } - - public boolean passByValueDoubleArray() { - double[] req = new double[2]; - double[] resp = service.identityDoubleArray(req); - return req != resp; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java deleted file mode 100644 index 28ace6aab7..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of PrimitivesServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(PrimitivesServiceClient.class) -public class PrimitivesServiceClientImpl extends PrimitivesLocalServiceClientImpl { - - @Reference - public void setPrimitivesService(PrimitivesService service) { - super.setPrimitivesLocalService(service); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java deleted file mode 100644 index ab1a3b4ab8..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of PrimitivesService. - * This implementation provides both a local and a remotable service. - */ -@Service(interfaces={PrimitivesService.class, PrimitivesLocalService.class}) -public class PrimitivesServiceImpl implements PrimitivesService, PrimitivesLocalService { - - public boolean negateBoolean(boolean flag) { - return !flag; - } - - public boolean[] negateBooleanArray(boolean[] flags) { - boolean[] resp = new boolean[flags.length]; - - for(int i = 0; i < flags.length; ++i) { - resp[i] = !flags[i]; - } - return resp; - } - - public boolean[] identityBooleanArray(boolean[] flags) { - return flags; - } - - public byte negateByte(byte b) { - return (byte)-b; - } - - public byte[] negateByteArray(byte[] ba) { - byte[] resp = new byte[ba.length]; - - for(int i = 0; i < ba.length; ++i) { - resp[i] = (byte)-ba[i]; - } - return resp; - } - - public byte[] identityByteArray(byte[] ba) { - return ba; - } - - public short negateShort(short s) { - return (short)-s; - } - - public short[] negateShortArray(short[] s) { - short[] resp = new short[s.length]; - - for(int i = 0; i < s.length; ++i) { - resp[i] = (short)-s[i]; - } - return resp; - } - - public short[] identityShortArray(short[] sa) { - return sa; - } - - public int negateInt(int i) { - return -i; - } - - public int[] negateIntArray(int[] ia) { - int[] resp = new int[ia.length]; - - for(int i = 0; i < ia.length; ++i) { - resp[i] = -ia[i]; - } - return resp; - } - - public int[] identityIntArray(int[] ia) { - return ia; - } - - public long negateLong(long l) { - return -l; - } - - public long[] negateLongArray(long[] la) { - long[] resp = new long[la.length]; - - for(int i = 0; i < la.length; ++i) { - resp[i] = -la[i]; - } - return resp; - } - - public long[] identityLongArray(long[] la) { - return la; - } - - public float negateFloat(float f) { - return -f; - } - - public float[] negateFloatArray(float[] fa) { - float[] resp = new float[fa.length]; - - for(int i = 0; i < fa.length; ++i) { - resp[i] = -fa[i]; - } - return resp; - } - - public float[] identityFloatArray(float[] fa) { - return fa; - } - - public double negateDouble(double d) { - return -d; - } - - public double[] negateDoubleArray(double[] da) { - double[] resp = new double[da.length]; - - for(int i = 0; i < da.length; ++i) { - resp[i] = -da[i]; - } - return resp; - } - - public double[] identityDoubleArray(double[] da) { - return da; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java deleted file mode 100644 index 0a8f6772b5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of StandardTypesLocalServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(StandardTypesServiceClient.class) -public class StandardTypesLocalServiceClientImpl implements StandardTypesServiceClient { - - private StandardTypesLocalService service; - - @Reference(required=false) - protected void setStandardTypesLocalService(StandardTypesLocalService service) { - this.service = service; - } - - public BigInteger getNewBigIntegerForward(BigInteger bi) { - return service.getNewBigInteger(bi); - } - - public BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia) { - return service.getNewBigIntegerArray(bia); - } - - public BigDecimal getNewBigDecimalForward(BigDecimal bd) { - return service.getNewBigDecimal(bd); - } - - public BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda) { - return service.getNewBigDecimalArray(bda); - } - public Calendar getNewCalendarForward(Calendar c) { - return service.getNewCalendar(c); - } - public Calendar[] getNewCalendarArrayForward(Calendar[] ca) { - return service.getNewCalendarArray(ca); - } - - public Date getNewDateForward(Date d) { - return service.getNewDate(d); - } - - public Date[] getNewDateArrayForward(Date[] da) { - return service.getNewDateArray(da); - } - - public QName getNewQNameForward(QName qname) { - return service.getNewQName(qname); - } - - public QName[] getNewQNameArrayForward(QName[] qnames) { - return service.getNewQNameArray(qnames); - } - - public URI getNewURIForward(URI uri) { - return service.getNewURI(uri); - } - - public URI[] getNewURIArrayForward(URI[] uris) { - return service.getNewURIArray(uris); - } - - public XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal) { - return service.getNewXMLGregorianCalendar(xgcal); - } - - public XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals) { - return service.getNewXMLGregorianCalendarArray(xgcals); - } - - public Duration getNewDurationForward(Duration d) { - return service.getNewDuration(d); - } - - public Duration[] getNewDurationArrayForward(Duration[] da) { - return service.getNewDurationArray(da); - } - - public Object getNewObjectForward(Object obj) { - return service.getNewObject(obj); - } - - public Object[] getNewObjectArrayForward(Object[] objs) { - return service.getNewObjectArray(objs); - } - - public Image getNewImageForward(Image img) { - return service.getNewImage(img); - } - - public Image[] getNewImageArrayForward(Image[] imgs) { - return service.getNewImageArray(imgs); - } - - public DataHandler getNewDataHandlerForward(DataHandler dh) { - return service.getNewDataHandler(dh); - } - - public DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha) { - return service.getNewDataHandlerArray(dha); - } - - - public Source getNewSourceForward(Source src) { - return service.getNewSource(src); - } - - public Source[] getNewSourceArrayForward(Source[] srcs) { - return service.getNewSourceArray(srcs); - } - - public UUID getNewUUIDForward(UUID uuid) { - return service.getNewUUID(uuid); - } - - public UUID[] getNewUUIDArrayForward(UUID[] uuids) { - return service.getNewUUIDArray(uuids); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java deleted file mode 100644 index 626b0e9844..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of StandardTypesServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(StandardTypesServiceClient.class) -public class StandardTypesServiceClientImpl extends StandardTypesLocalServiceClientImpl { - - @Reference - public void setStandardTypesService(StandardTypesService service) { - super.setStandardTypesLocalService(service); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java deleted file mode 100644 index 19a6cae01b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java +++ /dev/null @@ -1,208 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of StandardTypesService. - * This implementation provides both a local and a remotable service. - */ -@Service(interfaces={StandardTypesService.class, StandardTypesLocalService.class}) -public class StandardTypesServiceImpl implements StandardTypesService, StandardTypesLocalService { - - public BigInteger getNewBigInteger(BigInteger bi) { - return bi.negate(); - } - - public BigInteger[] getNewBigIntegerArray(BigInteger[] bia) { - BigInteger[] resp = new BigInteger[bia.length]; - for(int i = 0; i < bia.length; ++i) { - resp[i] = bia[i].negate(); - } - return resp; - } - - public BigDecimal getNewBigDecimal(BigDecimal bd) { - return bd.negate(); - } - - public BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda) { - BigDecimal[] resp = new BigDecimal[bda.length]; - for(int i = 0; i < bda.length; ++i) { - resp[i] = bda[i].negate(); - } - return resp; - } - - public Calendar getNewCalendar(Calendar c) { - Calendar resp = (Calendar)c.clone(); - resp.add(Calendar.DAY_OF_MONTH, 5); - return resp; - } - - public Calendar[] getNewCalendarArray(Calendar[] ca) { - Calendar[] resp = new Calendar[ca.length]; - for(int i = 0; i < ca.length; ++i) { - resp[i] = getNewCalendar(ca[i]); - } - return resp; - } - - public Date getNewDate(Date d) { - return new Date(d.getTime() + 5*24*60*60*1000); - } - - public Date[] getNewDateArray(Date[] da) { - Date[] resp = new Date[da.length]; - for(int i = 0; i < da.length; ++i) { - resp[i] = getNewDate(da[i]); - } - return resp; - } - - public QName getNewQName(QName qname) { - return new QName(qname.getNamespaceURI()+"q", qname.getLocalPart()+"q", qname.getPrefix()+"q"); - - } - - public QName[] getNewQNameArray(QName[] qnames) { - QName[] resp = new QName[qnames.length]; - for(int i = 0; i < qnames.length; ++i) { - resp[i] = getNewQName(qnames[i]); - } - return resp; - } - - public URI getNewURI(URI uri) { - return uri.resolve("uri"); - } - - public URI[] getNewURIArray(URI[] uris) { - URI[] resp = new URI[uris.length]; - for(int i = 0; i < uris.length; ++i) { - resp[i] = getNewURI(uris[i]); - } - return resp; - } - - public XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal) { - xgcal = (XMLGregorianCalendar)xgcal.clone(); - xgcal.setDay(xgcal.getDay()+5); - return xgcal; - } - - public XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcals) { - XMLGregorianCalendar[] resp = new XMLGregorianCalendar[xgcals.length]; - for(int i = 0; i < xgcals.length; ++i) { - resp[i] = getNewXMLGregorianCalendar(xgcals[i]); - } - return resp; - } - - public Duration getNewDuration(Duration d) { - return d.negate(); - } - - public Duration[] getNewDurationArray(Duration[] da) { - Duration[] resp = new Duration[da.length]; - for(int i = 0; i < da.length; ++i) { - resp[i] = da[i].negate(); - } - return resp; - } - - public Object getNewObject(Object obj) { - return StandardTypesTransformer.getNewObject(obj); - } - - public Object[] getNewObjectArray(Object[] objs) { - Object[] resp = new Object[objs.length]; - for(int i = 0; i < objs.length; ++i) { - resp[i] = getNewObject(objs[i]); - } - return resp; - } - - public Image getNewImage(Image img) { - return StandardTypesTransformer.getNewImage(img); - } - - public Image[] getNewImageArray(Image[] imgs) { - Image[] resp = new Image[imgs.length]; - for(int i = 0; i < imgs.length; ++i) { - resp[i] = getNewImage(imgs[i]); - } - return resp; - } - - public DataHandler getNewDataHandler(DataHandler dh) { - // FIXME: transform the input - return dh; - } - - public DataHandler[] getNewDataHandlerArray(DataHandler[] dha) { - DataHandler[] resp = new DataHandler[dha.length]; - for(int i = 0; i < dha.length; ++i) { - resp[i] = dha[i]; - } - return resp; - } - - public Source getNewSource(Source src) { - return StandardTypesTransformer.getNewSource(src); - } - - public Source[] getNewSourceArray(Source[] srcs) { - Source[] resp = new Source[srcs.length]; - for(int i = 0; i < srcs.length; ++i) { - resp[i] = getNewSource(srcs[i]); - } - return resp; - } - - public UUID getNewUUID(UUID uuid) { - return UUID.fromString(uuid.toString()+"AAA"); - } - - public UUID[] getNewUUIDArray(UUID[] uuids) { - UUID[] resp = new UUID[uuids.length]; - for(int i = 0; i < uuids.length; ++i) { - resp[i] = getNewUUID(uuids[i]); - } - return resp; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java deleted file mode 100644 index 68510b4b03..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import java.awt.Image; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.CharArrayReader; -import java.io.CharArrayWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; - -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamSource; - -import org.xml.sax.InputSource; - - - -/** - * StandardTypesTransformer class that provide for transforming input provided to StandardTypesService methods. - * - * @version $Rev$ $Date$ - */ -public class StandardTypesTransformer { - - public static Object getNewObject(Object obj) { - if(obj instanceof String) { - return "Hello "+obj; - } else if(obj instanceof Integer) { - return new Integer(-((Integer)obj).intValue()); - } else if(obj instanceof Double) { - return new Double(-((Double)obj).doubleValue()); - } - - return obj; - } - - /** - * Returns a copy of the source object if the input is DOMSource, SAXSource or StreamSource. - * Returns the input object as is for other types. - */ - public static Source getNewSource(Source src) { - Source ret = null; - if(src instanceof DOMSource) { - DOMSource dsrc = (DOMSource)src; - ret = new DOMSource(dsrc.getNode() != null ? dsrc.getNode().cloneNode(true) : null); - } else if(src instanceof SAXSource) { - SAXSource ssrc = (SAXSource)src; - if(ssrc.getInputSource().getByteStream() != null) { - InputStream inp = ssrc.getInputSource().getByteStream(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - int b; - try { - while((b = inp.read()) != -1) { - bout.write(b); - } - } catch (IOException ignored) { - } - try { bout.close();} catch (IOException ignored) {} - try { inp.reset();} catch (IOException ignored) {} - ret = new SAXSource(new InputSource(new ByteArrayInputStream(bout.toByteArray()))); - } else if(ssrc.getInputSource().getCharacterStream() != null) { - Reader rdr = ssrc.getInputSource().getCharacterStream(); - CharArrayWriter caw = new CharArrayWriter(); - try { - int c; - while((c = rdr.read()) != -1) { - caw.append((char)c); - } - } catch (IOException ignored) { - } - caw.close(); - try{ rdr.reset();} catch(IOException ignored) {} - ret = new SAXSource(new InputSource(new CharArrayReader(caw.toCharArray()))); - } else { - ret = new SAXSource(); - } - } else if(src instanceof StreamSource) { - StreamSource ssrc = (StreamSource)src; - if(ssrc.getInputStream() != null) { - InputStream inp = ssrc.getInputStream(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - int b; - try { - while((b = inp.read()) != -1) { - bout.write(b); - } - } catch (IOException ignored) { - } - try { bout.close();} catch (IOException ignored) {} - try { inp.reset();} catch (IOException ignored) {} - ret = new StreamSource(new ByteArrayInputStream(bout.toByteArray())); - } else if(ssrc.getReader() != null) { - Reader rdr = ssrc.getReader(); - CharArrayWriter caw = new CharArrayWriter(); - try { - int c; - while((c = rdr.read()) != -1) { - caw.append((char)c); - } - } catch (IOException ignored) { - } - caw.close(); - try{ rdr.reset();} catch(IOException ignored) {} - ret = new StreamSource(new CharArrayReader(caw.toCharArray())); - } else { - ret = new StreamSource(); - } - } - - if(ret != null) { - ret.setSystemId(src.getSystemId()); - } else { - ret = src; - } - return ret; - } - - public static Image getNewImage(Image arg) { - arg.getGraphics().drawOval(2, 2, 7, 7); - return arg; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl deleted file mode 100644 index 10a242be4d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite deleted file mode 100644 index b0d3fe7aeb..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite deleted file mode 100644 index 910091cf53..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite deleted file mode 100644 index 2dfcb1327b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite deleted file mode 100644 index 20529e7273..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite deleted file mode 100644 index 61c8a70a9a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java deleted file mode 100644 index 4967b896a5..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java +++ /dev/null @@ -1,339 +0,0 @@ -/* - * 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.databindings.jaxb; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class DatabindingTestCase { - - private static SCADomain domain; - - /** - * Runs once before running the tests - */ - @BeforeClass - public static void setUp() throws Exception { - try { - domain = SCADomain.newInstance("helloservice.composite"); - } catch(Throwable e) { - e.printStackTrace(); - } - } - - /** - * Runs once after running the tests - */ - @AfterClass - public static void tearDown() { - domain.close(); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetings. - */ - @Test - public void testSCA() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTest(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testSCAArray() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestArray(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testSCAList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testSCAArrayList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestArrayList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testSCAMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testSCAHashMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestHashMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testSCAVarArgs() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestVarArgs(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetings. - */ - @Test - public void testWS() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTest(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testWSArray() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestArray(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testWSList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testWSArrayList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestArrayList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testWSMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testWSHashMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestHashMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testWSVarArgs() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestVarArgs(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetings. - */ - @Test - public void testSCALocal() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTest(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testSCALocalArray() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestArray(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testSCALocalList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testSCALocalArrayList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestArrayList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testSCALocalMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testSCALocalHashMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestHashMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testSCALocalVarArgs() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = domain.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestVarArgs(helloServiceSimpleClient); - } - - private void performTest(HelloServiceSimpleClient helloServiceSimpleClient) { - String name = "Pandu"; - String resp = helloServiceSimpleClient.getGreetingsForward(name); - Assert.assertEquals("Hello "+name, resp); - } - - private void performTestArray(HelloServiceSimpleClient helloServiceSimpleClient) { - String[] names = {"Me", "Pandu"}; - String[] resps = helloServiceSimpleClient.getGreetingsArrayForward(names); - for(int i = 0; i < names.length; ++i) { - Assert.assertEquals("Hello "+names[i], resps[i]); - } - } - - private void performTestList(HelloServiceSimpleClient helloServiceSimpleClient) { - List namesList = new ArrayList(); - namesList.add("Me"); - namesList.add("Pandu"); - namesList.add("Chinnipandu"); - List respList = helloServiceSimpleClient.getGreetingsListForward(namesList); - Assert.assertEquals(namesList.size(), respList.size()); - for(int i = 0; i < namesList.size(); ++i) { - Assert.assertEquals("Hello "+namesList.get(i), respList.get(i)); - } - } - - private void performTestArrayList(HelloServiceSimpleClient helloServiceSimpleClient) { - ArrayList namesList = new ArrayList(); - namesList.add("Me"); - namesList.add("Pandu"); - namesList.add("Chinnipandu"); - ArrayList respList = helloServiceSimpleClient.getGreetingsArrayListForward(namesList); - Assert.assertEquals(namesList.size(), respList.size()); - for(int i = 0; i < namesList.size(); ++i) { - Assert.assertEquals("Hello "+namesList.get(i), respList.get(i)); - } - } - - private void performTestMap(HelloServiceSimpleClient helloServiceSimpleClient) { - Map namesMap = new HashMap(); - namesMap.put("Me", null); - namesMap.put("Pandu", null); - namesMap.put("Chinnipandu", null); - Map respMap = helloServiceSimpleClient.getGreetingsMapForward(namesMap); - Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size()); - for(Map.Entry entry: namesMap.entrySet()) { - Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey())); - } - } - - private void performTestHashMap(HelloServiceSimpleClient helloServiceSimpleClient) { - HashMap namesMap = new HashMap(); - namesMap.put("Me", null); - namesMap.put("Pandu", null); - namesMap.put("Chinnipandu", null); - Map respMap = helloServiceSimpleClient.getGreetingsHashMapForward(namesMap); - Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size()); - for(Map.Entry entry: namesMap.entrySet()) { - Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey())); - } - } - - private void performTestVarArgs(HelloServiceSimpleClient helloServiceSimpleClient) { - String[] names = { "Me", "You", "Pandu" }; // Do not change the array size from 3. - String expected = "Hello Me You Pandu"; - String actual = helloServiceSimpleClient.getGreetingsVarArgsForward(names[0], names[1], names[2]); - Assert.assertEquals(expected, actual); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java deleted file mode 100644 index 744bf20494..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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.databindings.jaxb; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class DocLitBareWsdlTestCase { - - private static SCADomain domain; - - /** - * Runs once before running the tests - */ - @BeforeClass - public static void setUp() throws Exception { - try { - domain = SCADomain.newInstance("doclitbarewsdl.composite"); - } catch (Throwable e) { - // @Ignore("TUSCANY-2398") - e.printStackTrace(); - } - } - - /** - * Runs once after running the tests - */ - @AfterClass - public static void tearDown() { - if (domain != null) { - domain.close(); - } - } - - // @Ignore("TUSCANY-2398") - @Test - public void testDocLitBareWsdl() throws Exception { - AClientService client = domain.getService(AClientService.class, "AClientComponent"); - String name = "Pandu"; - String resp = client.getGreetingsForward(name); - Assert.assertEquals("Hello " + name, resp); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java deleted file mode 100644 index c22d00140e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java +++ /dev/null @@ -1,484 +0,0 @@ -/* - * 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.databindings.jaxb; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsTransformer; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Databinding tests for generics, parameterized and polymorphic types. - * - * @version $Rev$ $Date$ - */ -public class GenericsDatabindingTestCase { - private static SCADomain domain; - - /** - * Runs before each test method - */ - @BeforeClass - public static void setUp() throws Exception { - try { - domain = SCADomain.newInstance("generics-service.composite"); - } catch(Throwable e) { - e.printStackTrace(); - } - } - - /** - * Runs after each test method - */ - @AfterClass - public static void tearDown() { - domain.close(); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getTypeExplicit. - */ - @Test - public void testSCATypeExplicit() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestTypeExplicit(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getTypeUnbound. - */ - @Test - public void testSCATypeUnbound() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestTypeUnbound(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getTypeExtends. - */ - @Test - public void testSCATypeExtends() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestTypeExtends(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getRecursiveTypeBound. - */ - @Test - public void testSCARecursiveTypeBound() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestRecursiveTypeBound(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getWildcardUnbound. - */ - @Test - public void testSCAWildcardUnbound() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestWildcardUnbound(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getWildcardSuper. - */ - @Test - public void testSCAWildcardSuper() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestWildcardSuper(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getWildcardExtends. - */ - @Test - public void testSCAWildcardExtends() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestWildcardExtends(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getPolymorphic. - */ - @Test - public void testSCAPolymorphic() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestPolymorphic(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getTypeExplicit. - */ - @Test - public void testWSTypeExplicit() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestTypeExplicit(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getTypeUnbound. - */ - @Test - public void testWSTypeUnbound() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestTypeUnbound(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getTypeExtends. - */ - @Test - public void testWSTypeExtends() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestTypeExtends(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getRecursiveTypeBound. - */ - @Test - public void testWSRecursiveTypeBound() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestRecursiveTypeBound(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getWildcardUnbound. - */ - @Test - public void testWSWildcardUnbound() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestWildcardUnbound(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getWildcardSuper. - */ - @Test - public void testWSWildcardSuper() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestWildcardSuper(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getWildcardExtends. - */ - @Test - public void testWSWildcardExtends() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestWildcardExtends(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getPolymorphic. - */ - @Test - public void testWSPolymorphic() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestPolymorphic(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getTypeExplicit. - */ - @Test - public void testSCALocalTypeExplicit() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestTypeExplicit(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getTypeUnbound. - */ - @Test - public void testSCALocalTypeUnbound() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestTypeUnbound(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getTypeExtends. - */ - @Test - public void testSCALocalTypeExtends() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestTypeExtends(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getRecursiveTypeBound. - */ - @Test - public void testSCALocalRecursiveTypeBound() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestRecursiveTypeBound(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getWildcardUnbound. - */ - @Test - public void testSCALocalWildcardUnbound() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestWildcardUnbound(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getWildcardSuper. - */ - @Test - public void testSCALocalWildcardSuper() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestWildcardSuper(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getWildcardExtends. - */ - @Test - public void testSCALocalWildcardExtends() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestWildcardExtends(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getPolymorphic. - */ - @Test - public void testSCALocalPolymorphic() throws Exception { - GenericsServiceClient serviceClient = domain.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestPolymorphic(serviceClient); - } - - private void performTestTypeExplicit(GenericsServiceClient serviceClient) { - Bean1 args[] = new Bean1[2]; - args[0] = new Bean1("Me"); - args[1] = new Bean1(); - for(int i = 0; i < args.length; ++i) { - Bean1 arg = args[i]; - Bean1 expected = GenericsTransformer.getTypeExplicit(arg); - Bean1 actual = serviceClient.getTypeExplicitForward(arg); - Assert.assertEquals(expected, actual); - } - } - - private void performTestTypeUnbound(GenericsServiceClient serviceClient) { - { // String - String[] args = { "Me", "You", "Him" }; - Bean1 expected = GenericsTransformer.getTypeUnbound(args); - Bean1 actual = serviceClient.getTypeUnboundForward(args); - // Assert.assertEquals(expected, actual); - } - { // Integer - Integer[] args = new Integer[3]; - args[0] = -10; - args[1] = 0; - args[2] = 10; - Bean1 expected = GenericsTransformer.getTypeUnbound(args); - Bean1 actual = serviceClient.getTypeUnboundForward(args); - // Assert.assertEquals(expected, actual); - } - { // Object - Object[] args = new Object[3]; - args[0] = "Me"; - args[1] = 10; - args[2] = "Him"; - Bean1 expected = GenericsTransformer.getTypeUnbound(args); - Bean1 actual = serviceClient.getTypeUnboundForward(args); - Assert.assertEquals(expected, actual); - } - } - - private void performTestTypeExtends(GenericsServiceClient serviceClient) { - { // Bean2 - Bean2[] args = new Bean2[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean2(); - args[i].setName("Name"+i); - } - - Bean1 expected = GenericsTransformer.getTypeExtends(args); - Bean1 actual = serviceClient.getTypeExtendsForward(args); - Assert.assertEquals(expected, actual); - } - { // Bean3 extends Bean2 - Bean3[] args = new Bean3[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean3(); - args[i].setName("Name"+i); - args[i].setAddress("Address"+i); - } - - Bean1 expected = GenericsTransformer.getTypeExtends(args); - Bean1 actual = serviceClient.getTypeExtendsForward(args); - // Assert.assertEquals(expected, actual); - } - { //Bean31 extends Bean2 - Bean31[] args = new Bean31[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean31(); - args[i].setName("Name"+i); - args[i].setAddress("Address"+i); - } - - Bean1 expected = GenericsTransformer.getTypeExtends(args); - Bean1 actual = serviceClient.getTypeExtendsForward(args); - // Assert.assertEquals(expected, actual); - } - } - - private void performTestRecursiveTypeBound(GenericsServiceClient serviceClient) { - { // Bean1 - Bean1[] args = new Bean1[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean1(); - args[i].setItem("Bean."+i); - } - Bean1> expected = GenericsTransformer.getRecursiveTypeBound(args); - Bean1> actual = serviceClient.getRecursiveTypeBoundForward(args); - Assert.assertEquals(expected, actual); - } - { // Bean10 extends Bean1 - Bean10[] args = new Bean10[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean10(); - args[i].setItem("Bean10."+i); - } - Bean1 expected = GenericsTransformer.getRecursiveTypeBound(args); - Bean1 actual = serviceClient.getRecursiveTypeBoundForward(args); - // Assert.assertEquals(expected, actual); - } - { // Bean11 extends Bean1 - Bean11[] args = new Bean11[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean11(); - args[i].setItem("Bean11."+i); - } - Bean1 expected = GenericsTransformer.getRecursiveTypeBound(args); - Bean1 actual = serviceClient.getRecursiveTypeBoundForward(args); - // Assert.assertEquals(expected, actual); - } - } - - private void performTestWildcardUnbound(GenericsServiceClient serviceClient) { - { - Bean1 arg = new Bean1("Me"); - Bean1 expected = GenericsTransformer.getWildcardUnbound(arg); - Bean1 actual = serviceClient.getWildcardUnboundForward(arg); - Assert.assertEquals(expected, actual); - } - { - Bean1 arg = new Bean1(1); - Bean1 expected = GenericsTransformer.getWildcardUnbound(arg); - Bean1 actual = serviceClient.getWildcardUnboundForward(arg); - Assert.assertEquals(expected, actual); - } - } - - private void performTestWildcardSuper(GenericsServiceClient serviceClient) { - Bean1 arg = new Bean1(); - Bean3 item = new Bean3(); - item.setName("Name"); - item.setAddress("Address"); - arg.setItem(item); - Bean1 expected = GenericsTransformer.getWildcardSuper(arg); - Bean1 actual = serviceClient.getWildcardSuperForward(arg); - Assert.assertEquals(expected, actual); - } - - private void performTestWildcardExtends(GenericsServiceClient serviceClient) { - { // Bean2 - Bean2 temp = new Bean2(); - temp.setName("Me"); - Bean1 arg = new Bean1(temp); - Bean1 expected = GenericsTransformer.getWildcardExtends(arg); - Bean1 actual = serviceClient.getWildcardExtendsForward(arg); - Assert.assertEquals(expected, actual); - } - { // Bean3 extends Bean2 - Bean3 temp = new Bean3(); - temp.setName("Me"); - temp.setAddress("My address"); - Bean1 arg = new Bean1(temp); - Bean1 expected = GenericsTransformer.getWildcardExtends(arg); - Bean1 actual = serviceClient.getWildcardExtendsForward(arg); - // The Bean3 will be unmarshalled into Bean2 - // Assert.assertEquals(expected, actual); - Assert.assertTrue(actual.getItem() instanceof Bean2); - } - { // Bean31 extends Bean2 - Bean31 temp = new Bean31(); - temp.setName("Me1"); - temp.setAddress("My address1"); - Bean1 arg = new Bean1(temp); - Bean1 expected = GenericsTransformer.getWildcardExtends(arg); - Bean1 actual = serviceClient.getWildcardExtendsForward(arg); - // The Bean31 will be unmarshalled into Bean2 - // Assert.assertEquals(expected, actual); - Assert.assertTrue(actual.getItem() instanceof Bean2); - } - } - - private void performTestPolymorphic(GenericsServiceClient serviceClient) { - { // Bean2 - Bean2 arg = new Bean2(); - arg.setName("Me"); - Bean2 expected = GenericsTransformer.getPolymorphic(arg); - Bean2 actual = serviceClient.getPolymorphicForward(arg); - Assert.assertEquals(expected, actual); - } - { // Bean3 extends Bean2 - Bean3 arg = new Bean3(); - arg.setName("Me"); - arg.setAddress("My address"); - Bean2 expected = GenericsTransformer.getPolymorphic(arg); - Bean2 actual = serviceClient.getPolymorphicForward(arg); - Assert.assertEquals(expected.getName(), actual.getName()); - } - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java deleted file mode 100644 index f8aaad3dac..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java +++ /dev/null @@ -1,776 +0,0 @@ -/* - * 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.databindings.jaxb; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class PrimitivesDatabindingTestCase { - - private static SCADomain domain; - - /** - * Runs before each test method - */ - @BeforeClass - public static void setUp() throws Exception { - try { - domain = SCADomain.newInstance("primitivesservice.composite"); - } catch(Throwable e) { - e.printStackTrace(); - Assert.fail(); - } - } - - /** - * Runs after each test method - */ - @AfterClass - public static void tearDown() { - domain.close(); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testSCANegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testSCANegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for boolean array. - */ - @Test - public void testSCAPassByValueBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateByte. - */ - @Test - public void testSCANegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testSCANegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for byte array. - */ - @Test - public void testSCAPassByValueByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueByteArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateShort. - */ - @Test - public void testSCANegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testSCANegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for short array. - */ - @Test - public void testSCAPassByValueShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueShortArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateInt. - */ - @Test - public void testSCANegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testSCANegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for int array. - */ - @Test - public void testSCAPassByValueIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueIntArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateLong. - */ - @Test - public void testSCANegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testSCANegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for long array. - */ - @Test - public void testSCAPassByValueLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueLongArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateFloat. - */ - @Test - public void testSCANegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testSCANegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for float array. - */ - @Test - public void testSCAPassByValueFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueFloatArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateDouble. - */ - @Test - public void testSCANegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testSCANegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for double array. - */ - @Test - public void testSCAPassByValueDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testWSNegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testWSNegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for boolean array. - */ - @Test - public void testWSPassByValueBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByte. - */ - @Test - public void testWSNegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testWSNegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for byte array. - */ - @Test - public void testWSPassByValueByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueByteArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShort. - */ - @Test - public void testWSNegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testWSNegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for short array. - */ - @Test - public void testWSPassByValueShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueShortArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateInt. - */ - @Test - public void testWSNegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testWSNegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for int array. - */ - @Test - public void testWSPassByValueIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueIntArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLong. - */ - @Test - public void testWSNegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testWSNegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for long array. - */ - @Test - public void testWSPassByValueLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueLongArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloat. - */ - @Test - public void testWSNegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testWSNegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for float array. - */ - @Test - public void testWSPassByValueFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueFloatArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDouble. - */ - @Test - public void testWSNegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testWSNegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for double array. - */ - @Test - public void testWSPassByValueDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray()); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testSCALocalNegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testSCALocalNegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateByte. - */ - @Test - public void testSCALocalNegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testSCALocalNegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateShort. - */ - @Test - public void testSCALocalNegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testSCALocalNegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateInt. - */ - @Test - public void testSCALocalNegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testSCALocalNegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateLong. - */ - @Test - public void testSCALocalNegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testSCALocalNegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateFloat. - */ - @Test - public void testSCALocalNegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testSCALocalNegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateDouble. - */ - @Test - public void testSCALocalNegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testSCALocalNegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - private void performTestNegateBoolean(PrimitivesServiceClient primitivesServiceClient) { - Assert.assertTrue(primitivesServiceClient.negateBooleanForward(false)); - Assert.assertFalse(primitivesServiceClient.negateBooleanForward(true)); - } - - private void performTestNegateBooleanArray(PrimitivesServiceClient primitivesServiceClient) { - boolean flags[] = new boolean[2]; - flags[0] = false; - flags[1] = true; - boolean[] respFlags = primitivesServiceClient.negateBooleanArrayForward(flags); - Assert.assertEquals(flags.length, respFlags.length); - for(int i = 0; i < flags.length; ++i) { - Assert.assertEquals(!flags[i], respFlags[i]); - } - } - - private void performTestNegateByte(PrimitivesServiceClient primitivesServiceClient) { - byte[] ba = new byte[3]; - ba[0] = -1; - ba[1] = 0; - ba[2] = 1; - - for(int i = 0; i < ba.length; ++i) { - Assert.assertEquals((byte)-ba[i], primitivesServiceClient.negateByteForward(ba[i])); - } - } - - private void performTestNegateByteArray(PrimitivesServiceClient primitivesServiceClient) { - byte[] ba = new byte[3]; - ba[0] = -1; - ba[1] = 0; - ba[2] = 1; - - byte[] r = primitivesServiceClient.negateByteArrayForward(ba); - Assert.assertEquals(ba.length, r.length); - for(int i = 0; i < ba.length; ++i) { - Assert.assertEquals((byte)-ba[i], r[i]); - } - } - - private void performTestNegateShort(PrimitivesServiceClient primitivesServiceClient) { - short[] s = new short[3]; - s[0] = -1; - s[1] = 0; - s[2] = 1; - - for(int i = 0; i < s.length; ++i) { - Assert.assertEquals((short)-s[i], primitivesServiceClient.negateShortForward(s[i])); - } - } - - private void performTestNegateShortArray(PrimitivesServiceClient primitivesServiceClient) { - short[] s = new short[3]; - s[0] = -1; - s[1] = 0; - s[2] = 1; - - short[] r = primitivesServiceClient.negateShortArrayForward(s); - Assert.assertEquals(s.length, r.length); - for(int i = 0; i < s.length; ++i) { - Assert.assertEquals((short)-s[i], r[i]); - } - } - - private void performTestNegateInt(PrimitivesServiceClient primitivesServiceClient) { - int[] ia = new int[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], primitivesServiceClient.negateIntForward(ia[i])); - } - } - - private void performTestNegateIntArray(PrimitivesServiceClient primitivesServiceClient) { - int[] ia = new int[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - int[] r = primitivesServiceClient.negateIntArrayForward(ia); - Assert.assertEquals(ia.length, r.length); - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], r[i]); - } - } - - private void performTestNegateLong(PrimitivesServiceClient primitivesServiceClient) { - long[] la = new long[3]; - la[0] = -1; - la[1] = 0; - la[2] = 1; - - for(int i = 0; i < la.length; ++i) { - Assert.assertEquals(-la[i], primitivesServiceClient.negateLongForward(la[i])); - } - } - - private void performTestNegateLongArray(PrimitivesServiceClient primitivesServiceClient) { - long[] la = new long[3]; - la[0] = -1; - la[1] = 0; - la[2] = 1; - - long[] r = primitivesServiceClient.negateLongArrayForward(la); - Assert.assertEquals(la.length, r.length); - for(int i = 0; i < la.length; ++i) { - Assert.assertEquals(-la[i], r[i]); - } - } - - private void performTestNegateFloat(PrimitivesServiceClient primitivesServiceClient) { - float[] fa = new float[3]; - fa[0] = -1; - fa[1] = 0; - fa[2] = 1; - - for(int i = 0; i < fa.length; ++i) { - Assert.assertEquals(-fa[i], primitivesServiceClient.negateFloatForward(fa[i])); - } - } - - private void performTestNegateFloatArray(PrimitivesServiceClient primitivesServiceClient) { - float[] ia = new float[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - float[] r = primitivesServiceClient.negateFloatArrayForward(ia); - Assert.assertEquals(ia.length, r.length); - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], r[i]); - } - } - - private void performTestNegateDouble(PrimitivesServiceClient primitivesServiceClient) { - double[] da = new double[3]; - da[0] = -1; - da[1] = 0; - da[2] = 1; - - for(int i = 0; i < da.length; ++i) { - Assert.assertEquals(-da[i], primitivesServiceClient.negateDoubleForward(da[i])); - } - } - - private void performTestNegateDoubleArray(PrimitivesServiceClient primitivesServiceClient) { - double[] da = new double[3]; - da[0] = -1; - da[1] = 0; - da[2] = 1; - - double[] r = primitivesServiceClient.negateDoubleArrayForward(da); - Assert.assertEquals(da.length, r.length); - for(int i = 0; i < da.length; ++i) { - Assert.assertEquals(-da[i], r[i]); - } - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java deleted file mode 100644 index 079e1cdfff..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java +++ /dev/null @@ -1,1439 +0,0 @@ -/* - * 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.databindings.jaxb; - -import java.awt.Image; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringReader; -import java.io.StringWriter; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.net.URL; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.TimeZone; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; - -import junit.framework.Assert; - -import org.apache.axiom.attachments.ByteArrayDataSource; -import org.apache.tuscany.sca.databinding.xml.String2Node; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.xml.sax.InputSource; - -/** - * @version $Rev$ $Date$ - */ -public class StandardTypesDatabindingTestCase { - - private static SCADomain domain; - - /** - * Runs before each test method - */ - @BeforeClass - public static void setUp() throws Exception { - try { - domain = SCADomain.newInstance("standard-types-service.composite"); - } catch (Throwable e) { - e.printStackTrace(); - } - } - - /** - * Runs after each test method - */ - @AfterClass - public static void tearDown() { - domain.close(); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testSCANewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testSCANewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testSCANewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testSCANewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testSCANewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testSCANewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDate. - */ - @Test - public void testSCANewDate() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testSCANewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewQName. - */ - @Test - public void testSCANewQName() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testSCANewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewURI. - */ - @Test - public void testSCANewURI() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testSCANewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testSCANewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testSCANewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testSCANewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testSCANewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewObject. - */ - @Test - public void testSCANewObject() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testSCANewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewImage. - */ - @Test - public void testSCANewImage() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testSCANewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testSCANewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testSCANewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewSource. - */ - @Test - public void testSCANewSource() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewSource(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewSourceArray. - */ - @Test - @Ignore("TUSCANY-2387") - public void testSCANewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewSourceArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testSCANewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testSCANewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewUUIDArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testWSNewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testWSNewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testWSNewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testWSNewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testWSNewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testWSNewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDate. - */ - @Test - public void testWSNewDate() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testWSNewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQName. - */ - @Test - public void testWSNewQName() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testWSNewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURI. - */ - @Test - public void testWSNewURI() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testWSNewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testWSNewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testWSNewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testWSNewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testWSNewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObject. - */ - @Test - public void testWSNewObject() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testWSNewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImage. - */ - @Test - public void testWSNewImage() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testWSNewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testWSNewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testWSNewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSource. - */ - @Test - // @Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A>") - public void testWSNewSource() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewSource(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSourceArray. - */ - @Test - @Ignore("TUSCANY-2386") - public void testWSNewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewSourceArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testWSNewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testWSNewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewUUIDArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testSCALocalNewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testSCALocalNewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testSCALocalNewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testSCALocalNewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testSCALocalNewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testSCALocalNewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewDate. - */ - @Test - public void testSCALocalNewDate() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testSCALocalNewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewQName. - */ - @Test - public void testSCALocalNewQName() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testSCALocalNewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewURI. - */ - @Test - public void testSCALocalNewURI() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testSCALocalNewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testSCALocalNewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testSCALocalNewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testSCALocalNewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testSCALocalNewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewObject. - */ - @Test - public void testSCALocalNewObject() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testSCALocalNewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewImage. - */ - @Test - public void testSCALocalNewImage() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testSCALocalNewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalLocalService service using SCA binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testSCALocalNewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testSCALocalNewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewSource. - */ - @Test - public void testSCALocalNewSource() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewSource(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewSourceArray. - */ - @Test - public void testSCALocalNewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewSourceArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testSCALocalNewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testSCALocalNewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewUUIDArray(serviceClient); - } - - private void performTestNewBigInteger(StandardTypesServiceClient serviceClient) { - BigInteger bi = new BigInteger("1234567890123456789012345678901234"); - BigInteger expected = bi.negate(); - BigInteger actual = serviceClient.getNewBigIntegerForward(bi); - Assert.assertEquals(expected, actual); - } - - private void performTestNewBigIntegerArray(StandardTypesServiceClient serviceClient) { - BigInteger[] bia = new BigInteger[2]; - bia[0] = new BigInteger("1234567890123456789012345678901234"); - bia[1] = new BigInteger("-98765432109876543210987654321"); - BigInteger[] actual = serviceClient.getNewBigIntegerArrayForward(bia); - Assert.assertEquals(bia.length, actual.length); - for (int i = 0; i < bia.length; ++i) { - Assert.assertEquals(bia[i].negate(), actual[i]); - } - } - - private void performTestNewBigDecimal(StandardTypesServiceClient serviceClient) { - BigDecimal bd = new BigDecimal("12345678901234567890.12345678901234"); - BigDecimal expected = bd.negate(); - BigDecimal actual = serviceClient.getNewBigDecimalForward(bd); - Assert.assertEquals(expected, actual); - } - - private void performTestNewBigDecimalArray(StandardTypesServiceClient serviceClient) { - BigDecimal[] bda = new BigDecimal[2]; - bda[0] = new BigDecimal("1234567890123456.789012345678901234"); - bda[1] = new BigDecimal("-987654321098765.43210987654321"); - BigDecimal[] actual = serviceClient.getNewBigDecimalArrayForward(bda); - Assert.assertEquals(bda.length, actual.length); - for (int i = 0; i < bda.length; ++i) { - Assert.assertEquals(bda[i].negate(), actual[i]); - } - } - - private void performTestNewCalendar(StandardTypesServiceClient serviceClient) { - Calendar[] ca = new Calendar[3]; - String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"}; - for (int i = 0; i < ca.length; ++i) { - ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i])); - ca[i].set(Calendar.DAY_OF_MONTH, i + 1); - } - for (int i = 0; i < ca.length; ++i) { - Calendar actual = serviceClient.getNewCalendarForward(ca[i]); - ca[i].add(Calendar.DAY_OF_MONTH, 5); - if (actual instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) { - // FIXME: Is this a problem? - // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover - // different from the instance passed. Adjust the gregorianCutover as per the input instance. - ((GregorianCalendar)actual).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange()); - } - Assert.assertEquals(ca[i], actual); - } - } - - private void performTestNewCalendarArray(StandardTypesServiceClient serviceClient) { - Calendar[] ca = new Calendar[3]; - String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"}; - for (int i = 0; i < ca.length; ++i) { - ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i])); - ca[i].set(Calendar.DAY_OF_MONTH, i + 1); - } - Calendar[] actual = serviceClient.getNewCalendarArrayForward(ca); - Assert.assertEquals(ca.length, actual.length); - for (int i = 0; i < ca.length; ++i) { - ca[i].add(Calendar.DAY_OF_MONTH, 5); - if (actual[i] instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) { - // FIXME: Is this a problem? - // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover - // different from the instance passed. Adjust the gregorianCutover as per the input instance. - ((GregorianCalendar)actual[i]).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange()); - } - Assert.assertEquals(ca[i], actual[i]); - } - } - - private void performTestNewDate(StandardTypesServiceClient serviceClient) { - Date d = new Date(); - Date expected = new Date(d.getTime() + 5 * 24 * 60 * 60 * 1000); - Date actual = serviceClient.getNewDateForward(d); - Assert.assertEquals(expected, actual); - } - - private void performTestNewDateArray(StandardTypesServiceClient serviceClient) { - Date[] d = new Date[2]; - Date[] expected = new Date[d.length]; - for (int i = 0; i < d.length; ++i) { - d[i] = new Date(); - d[i].setTime(d[i].getTime() + i * 24 * 60 * 60 * 1000); - expected[i] = new Date(d[i].getTime() + 5 * 24 * 60 * 60 * 1000); - } - Date[] actual = serviceClient.getNewDateArrayForward(d); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < expected.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewQName(StandardTypesServiceClient serviceClient) { - QName[] qnames = new QName[3]; - qnames[0] = new QName("localPart"); - qnames[1] = new QName("namespaceUri", "localPart"); - qnames[2] = new QName("namespaceUri", "localPart", "prefix"); - QName[] expected = new QName[qnames.length]; - for (int i = 0; i < qnames.length; ++i) { - expected[i] = - new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q", - qnames[i].getPrefix() + "q"); - } - for (int i = 0; i < qnames.length; ++i) { - QName actual = serviceClient.getNewQNameForward(qnames[i]); - Assert.assertEquals(expected[i], actual); - } - } - - private void performTestNewQNameArray(StandardTypesServiceClient serviceClient) { - QName[] qnames = new QName[4]; - qnames[0] = new QName("localPart"); - qnames[1] = new QName("namespaceUri", "localPart"); - qnames[2] = new QName("namespaceUri", "localPart", "prefix"); - qnames[3] = new QName("localPart2"); - QName[] expected = new QName[qnames.length]; - for (int i = 0; i < qnames.length; ++i) { - expected[i] = - new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q", - qnames[i].getPrefix() + "q"); - } - QName[] actual = serviceClient.getNewQNameArrayForward(qnames); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < qnames.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewURI(StandardTypesServiceClient serviceClient) { - URI[] uris = new URI[4]; - uris[0] = URI.create("a/b/c"); - uris[1] = URI.create("http://abc/"); - uris[2] = URI.create("ftp://a/b"); - uris[3] = URI.create("http://abc/").resolve("xyz"); - - for (int i = 0; i < uris.length; ++i) { - URI expected = uris[i].resolve("uri"); - URI actual = serviceClient.getNewURIForward(uris[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewURIArray(StandardTypesServiceClient serviceClient) { - URI[] uris = new URI[4]; - uris[0] = URI.create("a/b/c"); - // [rfeng] We need to have a trialign / to avoid the resolving problem - // FIXME: [vamsi] This is actually a data transformation problem. The array being returned from the service method is - // not making to the caller intact. - uris[1] = URI.create("http://abc/"); - uris[2] = URI.create("ftp://a/b"); - uris[3] = URI.create("http://abc/").resolve("xyz"); - - URI[] expected = new URI[uris.length]; - for (int i = 0; i < uris.length; ++i) { - expected[i] = uris[i].resolve("uri"); - } - - URI[] actual = serviceClient.getNewURIArrayForward(uris); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < uris.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewXMLGregorianCalendar(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3]; - xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19)); - xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13)); - xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16)); - - for (int i = 0; i < xgcals.length; ++i) { - XMLGregorianCalendar actual = serviceClient.getNewXMLGregorianCalendarForward(xgcals[i]); - xgcals[i].setDay(xgcals[i].getDay() + 5); - Assert.assertEquals(xgcals[i], actual); - } - } - - private void performTestNewXMLGregorianCalendarArray(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3]; - xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19)); - xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13)); - xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16)); - - XMLGregorianCalendar[] actual = serviceClient.getNewXMLGregorianCalendarArrayForward(xgcals); - Assert.assertEquals(xgcals.length, actual.length); - for (int i = 0; i < xgcals.length; ++i) { - xgcals[i].setDay(xgcals[i].getDay() + 5); - Assert.assertEquals(xgcals[i], actual[i]); - } - } - - private void performTestNewDuration(StandardTypesServiceClient serviceClient) throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - Duration[] da = new Duration[3]; - da[0] = df.newDuration(1000000000000L); - da[1] = df.newDurationDayTime(1000000000000L); - da[2] = df.newDurationYearMonth(true, 1, 3); - - for (int i = 0; i < da.length; ++i) { - Assert.assertEquals(da[i].negate(), serviceClient.getNewDurationForward(da[i])); - } - } - - private void performTestNewObject(StandardTypesServiceClient serviceClient) { - Object[] objs = new Object[5]; - objs[0] = "Hello"; - objs[1] = 10; - objs[2] = null; - objs[3] = -1.0; - objs[4] = null; - - for (int i = 0; i < objs.length; ++i) { - Object expected = StandardTypesTransformer.getNewObject(objs[i]); - Object actual = serviceClient.getNewObjectForward(objs[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewObjectArray(StandardTypesServiceClient serviceClient) { - Object[] objs = new Object[5]; - objs[0] = "Hello"; - objs[1] = 10; - objs[2] = null; - objs[3] = -1.0; - objs[4] = null; - - Object[] actual = serviceClient.getNewObjectArrayForward(objs); - Assert.assertEquals(objs.length, actual.length); - for (int i = 0; i < objs.length; ++i) { - Object expected = StandardTypesTransformer.getNewObject(objs[i]); - Assert.assertEquals(expected, actual[i]); - } - } - - private void performTestNewImage(StandardTypesServiceClient serviceClient) throws InterruptedException { - // Create some images to test with. - Image[] imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - Image[] copy = imgs; - // Create the same images once again as the StandardTypesTransformer may manipulate the image passed. - imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - // Make sure the images and copies are equal using ImageInfo - for(int i = 0; i < imgs.length; ++i) { - Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i])); - } - - for (int i = 0; i < imgs.length; ++i) { - Image actual = serviceClient.getNewImageForward(imgs[i]); - Image expected = StandardTypesTransformer.getNewImage(copy[i]); - // Compare using ImageInfo - Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual)); - } - } - - private void performTestNewImageArray(StandardTypesServiceClient serviceClient) throws InterruptedException { - // Create some images to test with. - Image[] imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - Image[] copy = imgs; - // Create the same images once again as the StandardTypesTransformer may manipulate the image passed. - imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - // Make sure the images and copies are equal using ImageInfo - for(int i = 0; i < imgs.length; ++i) { - Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i])); - } - - Image[] actual = serviceClient.getNewImageArrayForward(imgs); - Assert.assertEquals(imgs.length, actual.length); - for (int i = 0; i < imgs.length; ++i) { - Image expected = StandardTypesTransformer.getNewImage(copy[i]); - // Compare using ImageInfo - Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual[i])); - } - } - - private void performTestNewDurationArray(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - Duration[] da = new Duration[3]; - da[0] = df.newDuration(1000000000000L); - da[1] = df.newDurationDayTime(1000000000000L); - da[2] = df.newDurationYearMonth(true, 1, 3); - - Duration[] actual = serviceClient.getNewDurationArrayForward(da); - Assert.assertEquals(da.length, actual.length); - for (int i = 0; i < da.length; ++i) { - Assert.assertEquals(da[i].negate(), actual[i]); - } - } - - private void performTestNewDataHandler(StandardTypesServiceClient serviceClient) throws IOException { - DataHandler[] dha = new DataHandler[3]; - dha[0] = new DataHandler("Some data", "text/plain"); - dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html")); - dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes())); - - for (int i = 0; i < dha.length; ++i) { - DataHandler actual = serviceClient.getNewDataHandlerForward(dha[i]); - // Note: The DataHandler returned may use a different type of DataSource. - // Compare the data content instead of using equals(). - Assert.assertTrue(compare(dha[i], actual)); - } - } - - private void performTestNewDataHandlerArray(StandardTypesServiceClient serviceClient) throws IOException { - DataHandler[] dha = new DataHandler[3]; - dha[0] = new DataHandler("Some data", "text/plain"); - dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html")); - dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes())); - - DataHandler[] actual = serviceClient.getNewDataHandlerArrayForward(dha); - Assert.assertEquals(dha.length, actual.length); - for (int i = 0; i < dha.length; ++i) { - // Note: The DataHandler returned may use a different type of DataSource. - // Compare the data content instead of using equals(). - Assert.assertTrue(compare(dha[i], actual[i])); - } - } - - private void performTestNewSource(StandardTypesServiceClient serviceClient) throws Exception { - String xml = "ABC"; - Source[] srcs = new Source[3]; - srcs[0] = new DOMSource(new String2Node().transform(xml, null)); - srcs[1] = new SAXSource(new InputSource(new StringReader(xml))); - srcs[2] = new StreamSource(new StringReader(xml)); - - for (int i = 0; i < srcs.length; ++i) { - Source expected = StandardTypesTransformer.getNewSource(srcs[i]); - Source actual = serviceClient.getNewSourceForward(srcs[i]); - // [rfeng] The data may come back as a different source - Assert.assertEquals(sourceToString(expected), sourceToString(actual)); - } - } - - private void performTestNewSourceArray(StandardTypesServiceClient serviceClient) throws Exception { - String xml = "ABC"; - Source[] srcs = new Source[3]; - srcs[0] = new DOMSource(new String2Node().transform(xml, null)); - srcs[1] = new SAXSource(new InputSource(new StringReader(xml))); - srcs[2] = new StreamSource(new StringReader(xml)); - - Source[] actual = serviceClient.getNewSourceArrayForward(srcs); - Source[] expected = new Source[srcs.length]; - for(int i = 0; i < srcs.length; ++i) { - expected[i] = StandardTypesTransformer.getNewSource(srcs[i]); - } - Assert.assertEquals(srcs.length, actual.length); - for (int i = 0; i < srcs.length; ++i) { - // [rfeng] The data may come back as a different source - Assert.assertEquals(sourceToString(expected[i]), sourceToString(actual[i])); - } - - } - - private void performTestNewUUID(StandardTypesServiceClient serviceClient) { - UUID[] uuids = new UUID[3]; - uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes()); - uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes()); - uuids[2] = UUID.randomUUID(); - - for (int i = 0; i < uuids.length; ++i) { - UUID expected = UUID.fromString(uuids[i].toString() + "AAA"); - UUID actual = serviceClient.getNewUUIDForward(uuids[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewUUIDArray(StandardTypesServiceClient serviceClient) { - UUID[] uuids = new UUID[3]; - uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes()); - uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes()); - uuids[2] = UUID.randomUUID(); - - UUID[] actual = serviceClient.getNewUUIDArrayForward(uuids); - for (int i = 0; i < uuids.length; ++i) { - UUID expected = UUID.fromString(uuids[i].toString() + "AAA"); - Assert.assertEquals(expected, actual[i]); - } - } - - /** - * This method compares two DataHandlers. - * @return true if the data in the two handlers is the same. - */ - private boolean compare(DataHandler dh1, DataHandler dh2) throws IOException { - InputStream inp1 = dh1.getInputStream(); - InputStream inp2 = dh2.getInputStream(); - for(;;) { - int i1 = inp1.read(); - int i2 = inp2.read(); - if(i1 == -1 && i2 == -1) { - return true; - } else if(i1 != -1 && i2 != -1) { - if(i1 != i2) { - return false; - } - } else { - return false; - } - } - } - - /** - * This method returns the content of a source object as String. - */ - private String sourceToString(Source s) throws Exception { - StringWriter sw = new StringWriter(); - Result r = new StreamResult(sw); - TransformerFactory.newInstance().newTransformer().transform(s, r); - sw.close(); - return sw.toString(); - } - - /** - * This class initializes with the width, height and pixel data of a java.awt.Image object. - */ - private static class ImageInfo { - private int h, w, pixels[]; - public ImageInfo(Image img) throws InterruptedException { - w = img.getWidth(null); - h = img.getHeight(null); - pixels = new int[w*h]; - PixelGrabber pg = new PixelGrabber(img, 0, 0, w, h, pixels, 0, w); - pg.grabPixels(); - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } else if(!(that instanceof ImageInfo)) { - return false; - } - - ImageInfo that1 = (ImageInfo)that; - if(w != that1.w || h != that1.h || pixels == null || that1.pixels == null || pixels.length != that1.pixels.length) { - return false; - } - for(int i = 0; i < pixels.length; ++i) { - if(pixels[i] != that1.pixels[i]) { - return false; - } - } - return true; - } - - public String toString() { - return this.getClass().getSimpleName()+"[w = "+w+", h = "+h+", pixels = "+pixels+"]"; - } - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/pom.xml b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/pom.xml deleted file mode 100644 index 784de8da24..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/pom.xml +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - org.apache.tuscany.sca - itest-databindings - 1.5.1 - - - 4.0.0 - - itest-databindings-jaxb-top-down - 1.5.1 - jar - Apache Tuscany SCA iTest Databinding - JAXB Top Down - - - - - true - - java.net - java.net Maven 1.x Repository - http://download.java.net/maven/1 - legacy - - - java.net2 - java.net Maven 2.x Repository - http://download.java.net/maven/2 - - - - - - java.net2 - java.net Maven 2.x Repository - http://download.java.net/maven/2 - - - - - - org.apache.tuscany.sca - tuscany-node-impl - 1.5.1 - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1 - runtime - - - org.apache.tuscany.sca - tuscany-databinding-jaxb - 1.5.1 - runtime - - - org.apache.tuscany.sca - tuscany-databinding-sdo - 1.5.1 - compile - - - org.apache.tuscany.sca - tuscany-databinding-axiom - 1.5.1 - compile - - - org.apache.tuscany.sca - itest-databindings-common - 1.5.1 - compile - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1 - runtime - - - org.apache.tuscany.sca - tuscany-interface-java-xml - 1.5.1 - compile - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.5.1 - runtime - - - javax.xml.bind - jaxb-api - 2.1 - compile - - - - com.sun.xml.ws - jaxws-rt - 2.1.3 - - - - commons-collections - commons-collections - 3.1 - - - log4j - log4j - 1.2.12 - provided - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Djava.endorsed.dirs=target/endorsed - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - generate-sources - - copy - - - - - javax.xml.ws - jaxws-api - 2.1 - jar - - - javax.xml.bind - jaxb-api - 2.1 - jar - - - ${project.build.directory}/endorsed - false - true - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java deleted file mode 100644 index 352f805c7d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.databindings.jaxb; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for HelloService. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface HelloService { - String getGreetings(String name); - String[] getGreetingsArray(String[] names); - List getGreetingsList(List names); - ArrayList getGreetingsArrayList(ArrayList names); - Map getGreetingsMap(Map namesMap); - HashMap getGreetingsHashMap(HashMap namesMap); - String getGreetingsVarArgs(String... names); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java deleted file mode 100644 index 7bd95cec95..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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.databindings.jaxb; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * The interface for HelloServiceClient. - * - * @version $Rev$ $Date$ - */ -public interface HelloServiceClient { - String getGreetingsForward(String name); - String[] getGreetingsArrayForward(String[] names); - List getGreetingsListForward(List names); - ArrayList getGreetingsArrayListForward(ArrayList names); - Map getGreetingsMapForward(Map namesMap); - HashMap getGreetingsHashMapForward(HashMap namesMap); - String getGreetingsVarArgsForward(String... names); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java deleted file mode 100644 index 8c0fb24da9..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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.databindings.jaxb; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for PrimitivesService. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface PrimitivesService { - boolean negateBoolean(boolean flag); - boolean[] negateBooleanArray(boolean[] flags); - boolean[] identityBooleanArray(boolean[] flags); - byte negateByte(byte b); - byte[] negateByteArray(byte[] ba); - byte[] identityByteArray(byte[] ba); - short negateShort(short s); - short[] negateShortArray(short[] s); - short[] identityShortArray(short[] sa); - int negateInt(int s); - int[] negateIntArray(int[] s); - int[] identityIntArray(int[] ia); - long negateLong(long l); - long[] negateLongArray(long[] la); - long[] identityLongArray(long[] la); - float negateFloat(float f); - float[] negateFloatArray(float[] fa); - float[] identityFloatArray(float[] fa); - double negateDouble(double d); - double[] negateDoubleArray(double[] da); - double[] identityDoubleArray(double[] da); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java deleted file mode 100644 index 3a5a81bae4..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.databindings.jaxb; - - -/** - * The interface for PrimitivesServiceClient. - * - * @version $Rev$ $Date$ - */ -public interface PrimitivesServiceClient { - boolean negateBooleanForward(boolean flag); - boolean[] negateBooleanArrayForward(boolean[] flags); - boolean passByValueBooleanArray(); - byte negateByteForward(byte b); - byte[] negateByteArrayForward(byte[] ba); - boolean passByValueByteArray(); - short negateShortForward(short s); - short[] negateShortArrayForward(short[] sa); - boolean passByValueShortArray(); - int negateIntForward(int i); - int[] negateIntArrayForward(int[] ia); - boolean passByValueIntArray(); - long negateLongForward(long l); - long[] negateLongArrayForward(long[] la); - boolean passByValueLongArray(); - float negateFloatForward(float f); - float[] negateFloatArrayForward(float[] fa); - boolean passByValueFloatArray(); - double negateDoubleForward(double d); - double[] negateDoubleArrayForward(double[] da); - boolean passByValueDoubleArray(); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java deleted file mode 100644 index 4be057fe68..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * 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.databindings.jaxb; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - -import org.osoa.sca.annotations.Remotable; - - - -/** - * The interface for StandardTypesService. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface StandardTypesService { - BigInteger getNewBigInteger(BigInteger bi); - BigInteger[] getNewBigIntegerArray(BigInteger[] bia); - - BigDecimal getNewBigDecimal(BigDecimal bd); - BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda); - - Calendar getNewCalendar(Calendar c); - Calendar[] getNewCalendarArray(Calendar[] ca); - - Date getNewDate(Date d); - Date[] getNewDateArray(Date[] da); - - QName getNewQName(QName qname); - QName[] getNewQNameArray(QName[] qnames); - - URI getNewURI(URI uri); - URI[] getNewURIArray(URI[] uris); - - XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal); - XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcal); - - Duration getNewDuration(Duration d); - Duration[] getNewDurationArray(Duration[] da); - - Object getNewObject(Object obj); - Object[] getNewObjectArray(Object[] objs); - - Image getNewImage(Image img); - Image[] getNewImageArray(Image[] imgs); - - DataHandler getNewDataHandler(DataHandler dh); - DataHandler[] getNewDataHandlerArray(DataHandler[] dha); - - Source getNewSource(Source src); - Source[] getNewSourceArray(Source[] srcs); - - UUID getNewUUID(UUID uuid); - UUID[] getNewUUIDArray(UUID[] uuids); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java deleted file mode 100644 index 0c073cd054..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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.databindings.jaxb; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - - -/** - * The interface for StandardTypesServiceClient. - * - * @version $Rev$ $Date$ - */ -public interface StandardTypesServiceClient { - BigInteger getNewBigIntegerForward(BigInteger bi); - BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia); - - BigDecimal getNewBigDecimalForward(BigDecimal bd); - BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda); - - Calendar getNewCalendarForward(Calendar c); - Calendar[] getNewCalendarArrayForward(Calendar[] ca); - - Date getNewDateForward(Date d); - Date[] getNewDateArrayForward(Date[] da); - - QName getNewQNameForward(QName qname); - QName[] getNewQNameArrayForward(QName[] qnames); - - URI getNewURIForward(URI uri); - URI[] getNewURIArrayForward(URI[] uris); - - XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal); - XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals); - - Duration getNewDurationForward(Duration d); - Duration[] getNewDurationArrayForward(Duration[] da); - - Object getNewObjectForward(Object obj); - Object[] getNewObjectArrayForward(Object[] objs); - - Image getNewImageForward(Image img); - Image[] getNewImageArrayForward(Image[] imgs); - - DataHandler getNewDataHandlerForward(DataHandler dh); - DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha); - - Source getNewSourceForward(Source src); - Source[] getNewSourceArrayForward(Source[] srcs); - - UUID getNewUUIDForward(UUID uuid); - UUID[] getNewUUIDArrayForward(UUID[] uuids); -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java deleted file mode 100644 index c4026fdb9a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloService; -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of HelloServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(HelloServiceClient.class) -public class HelloServiceClientImpl { - - private HelloService service; - - @Reference - public void setHelloService(HelloService service) { - this.service = service; - } - - public String getGreetingsForward(String name) { - return service.getGreetings(name); - } - - public String[] getGreetingsArrayForward(String[] names) { - return service.getGreetingsArray(names); - } - - public List getGreetingsListForward(List names) { - return service.getGreetingsList(names); - } - - public Map getGreetingsMapForward(Map namesMap) { - return service.getGreetingsMap(namesMap); - } - - public ArrayList getGreetingsArrayListForward(ArrayList names) { - return service.getGreetingsArrayList(names); - } - - public HashMap getGreetingsHashMapForward(HashMap namesMap) { - return service.getGreetingsHashMap(namesMap); - } - - public String getGreetingsVarArgsForward(String... names) { - return service.getGreetingsVarArgs(names[0], names[1], names[2]); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java deleted file mode 100644 index fc2dc64b7d..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloService; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of HelloService. - * - * @version $Rev$ $Date$ - */ -@Service(interfaces = {HelloService.class}) -public class HelloServiceImpl implements HelloService { - public String getGreetings(String name) { - return "Hello " + name; - } - - public String[] getGreetingsArray(String[] names) { - String[] resps = new String[names.length]; - for (int i = 0; i < names.length; ++i) { - resps[i] = "Hello " + names[i]; - } - return resps; - } - - public List getGreetingsList(List names) { - List resps = new ArrayList(); - for (int i = 0; i < names.size(); ++i) { - resps.add("Hello " + names.get(i)); - } - return resps; - } - - public ArrayList getGreetingsArrayList(ArrayList names) { - ArrayList resps = new ArrayList(); - for (int i = 0; i < names.size(); ++i) { - resps.add("Hello " + names.get(i)); - } - return resps; - } - - public Map getGreetingsMap(Map namesMap) { - for (Map.Entry entry : namesMap.entrySet()) { - entry.setValue("Hello " + entry.getKey()); - } - return namesMap; - } - - public HashMap getGreetingsHashMap(HashMap namesMap) { - for (Map.Entry entry : namesMap.entrySet()) { - entry.setValue("Hello " + entry.getKey()); - } - return namesMap; - } - - public String getGreetingsVarArgs(String... names) { - String resp = "Hello"; - for(int i = 0; i < names.length; ++i) { - resp += (" "+names[i]); - } - return resp; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java deleted file mode 100644 index ef1a907b29..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of PrimitivesServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - * - * @version $Rev$ $Date$ - */ -@Service(PrimitivesServiceClient.class) -public class PrimitivesServiceClientImpl { - - private PrimitivesService service; - - @Reference - public void setPrimitivesService(PrimitivesService service) { - this.service = service; - } - public boolean negateBooleanForward(boolean flag) { - return service.negateBoolean(flag); - } - - public boolean[] negateBooleanArrayForward(boolean[] flags) { - return service.negateBooleanArray(flags); - } - - public boolean passByValueBooleanArray() { - boolean[] req = new boolean[2]; - boolean[] resp = service.identityBooleanArray(req); - return req != resp; - } - - public byte negateByteForward(byte b) { - return service.negateByte(b); - } - - public byte[] negateByteArrayForward(byte[] ba) { - return service.negateByteArray(ba); - } - - public boolean passByValueByteArray() { - byte[] req = new byte[2]; - byte[] resp = service.identityByteArray(req); - return req != resp; - } - - public short negateShortForward(short s) { - return service.negateShort(s); - } - - public short[] negateShortArrayForward(short[] s) { - return service.negateShortArray(s); - } - - public boolean passByValueShortArray() { - short[] req = new short[2]; - short[] resp = service.identityShortArray(req); - return req != resp; - } - - public int negateIntForward(int i) { - return service.negateInt(i); - } - - public int[] negateIntArrayForward(int[] ia) { - return service.negateIntArray(ia); - } - - public boolean passByValueIntArray() { - int[] req = new int[2]; - int[] resp = service.identityIntArray(req); - return req != resp; - } - - public long negateLongForward(long l) { - return service.negateLong(l); - } - - public long[] negateLongArrayForward(long[] la) { - return service.negateLongArray(la); - } - - public boolean passByValueLongArray() { - long[] req = new long[2]; - long[] resp = service.identityLongArray(req); - return req != resp; - } - - public float negateFloatForward(float f) { - return service.negateFloat(f); - } - - public float[] negateFloatArrayForward(float[] fa) { - return service.negateFloatArray(fa); - } - - public boolean passByValueFloatArray() { - float[] req = new float[2]; - float[] resp = service.identityFloatArray(req); - return req != resp; - } - - public double negateDoubleForward(double d) { - return service.negateDouble(d); - } - - public double[] negateDoubleArrayForward(double[] da) { - return service.negateDoubleArray(da); - } - - public boolean passByValueDoubleArray() { - double[] req = new double[2]; - double[] resp = service.identityDoubleArray(req); - return req != resp; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java deleted file mode 100644 index e60ae41767..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of PrimitivesService. - * - * @version $Rev$ $Date$ - */ -@Service(interfaces={PrimitivesService.class}) -public class PrimitivesServiceImpl implements PrimitivesService { - - public boolean negateBoolean(boolean flag) { - return !flag; - } - - public boolean[] negateBooleanArray(boolean[] flags) { - boolean[] resp = new boolean[flags.length]; - - for(int i = 0; i < flags.length; ++i) { - resp[i] = !flags[i]; - } - return resp; - } - - public boolean[] identityBooleanArray(boolean[] flags) { - return flags; - } - - public byte negateByte(byte b) { - return (byte)-b; - } - - public byte[] negateByteArray(byte[] ba) { - byte[] resp = new byte[ba.length]; - - for(int i = 0; i < ba.length; ++i) { - resp[i] = (byte)-ba[i]; - } - return resp; - } - - public byte[] identityByteArray(byte[] ba) { - return ba; - } - - public short negateShort(short s) { - return (short)-s; - } - - public short[] negateShortArray(short[] s) { - short[] resp = new short[s.length]; - - for(int i = 0; i < s.length; ++i) { - resp[i] = (short)-s[i]; - } - return resp; - } - - public short[] identityShortArray(short[] sa) { - return sa; - } - - public int negateInt(int i) { - return -i; - } - - public int[] negateIntArray(int[] ia) { - int[] resp = new int[ia.length]; - - for(int i = 0; i < ia.length; ++i) { - resp[i] = -ia[i]; - } - return resp; - } - - public int[] identityIntArray(int[] ia) { - return ia; - } - - public long negateLong(long l) { - return -l; - } - - public long[] negateLongArray(long[] la) { - long[] resp = new long[la.length]; - - for(int i = 0; i < la.length; ++i) { - resp[i] = -la[i]; - } - return resp; - } - - public long[] identityLongArray(long[] la) { - return la; - } - - public float negateFloat(float f) { - return -f; - } - - public float[] negateFloatArray(float[] fa) { - float[] resp = new float[fa.length]; - - for(int i = 0; i < fa.length; ++i) { - resp[i] = -fa[i]; - } - return resp; - } - - public float[] identityFloatArray(float[] fa) { - return fa; - } - - public double negateDouble(double d) { - return -d; - } - - public double[] negateDoubleArray(double[] da) { - double[] resp = new double[da.length]; - - for(int i = 0; i < da.length; ++i) { - resp[i] = -da[i]; - } - return resp; - } - - public double[] identityDoubleArray(double[] da) { - return da; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java deleted file mode 100644 index 8803eb262a..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of StandardTypesServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - * - * @version $Rev$ $Date$ - */ -@Service(StandardTypesServiceClient.class) -public class StandardTypesServiceClientImpl implements StandardTypesServiceClient{ - - private StandardTypesService service; - - @Reference - public void setStandardTypesService(StandardTypesService service) { - this.service = service; - } - - public BigInteger getNewBigIntegerForward(BigInteger bi) { - return service.getNewBigInteger(bi); - } - - public BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia) { - return service.getNewBigIntegerArray(bia); - } - - public BigDecimal getNewBigDecimalForward(BigDecimal bd) { - return service.getNewBigDecimal(bd); - } - - public BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda) { - return service.getNewBigDecimalArray(bda); - } - public Calendar getNewCalendarForward(Calendar c) { - return service.getNewCalendar(c); - } - public Calendar[] getNewCalendarArrayForward(Calendar[] ca) { - return service.getNewCalendarArray(ca); - } - - public Date getNewDateForward(Date d) { - return service.getNewDate(d); - } - - public Date[] getNewDateArrayForward(Date[] da) { - return service.getNewDateArray(da); - } - - public QName getNewQNameForward(QName qname) { - return service.getNewQName(qname); - } - - public QName[] getNewQNameArrayForward(QName[] qnames) { - return service.getNewQNameArray(qnames); - } - - public URI getNewURIForward(URI uri) { - return service.getNewURI(uri); - } - - public URI[] getNewURIArrayForward(URI[] uris) { - return service.getNewURIArray(uris); - } - - public XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal) { - return service.getNewXMLGregorianCalendar(xgcal); - } - - public XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals) { - return service.getNewXMLGregorianCalendarArray(xgcals); - } - - public Duration getNewDurationForward(Duration d) { - return service.getNewDuration(d); - } - - public Duration[] getNewDurationArrayForward(Duration[] da) { - return service.getNewDurationArray(da); - } - - public Object getNewObjectForward(Object obj) { - return service.getNewObject(obj); - } - - public Object[] getNewObjectArrayForward(Object[] objs) { - return service.getNewObjectArray(objs); - } - - public Image getNewImageForward(Image img) { - return service.getNewImage(img); - } - - public Image[] getNewImageArrayForward(Image[] imgs) { - return service.getNewImageArray(imgs); - } - - public DataHandler getNewDataHandlerForward(DataHandler dh) { - return service.getNewDataHandler(dh); - } - - public DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha) { - return service.getNewDataHandlerArray(dha); - } - - - public Source getNewSourceForward(Source src) { - return service.getNewSource(src); - } - - public Source[] getNewSourceArrayForward(Source[] srcs) { - return service.getNewSourceArray(srcs); - } - - public UUID getNewUUIDForward(UUID uuid) { - return service.getNewUUID(uuid); - } - - public UUID[] getNewUUIDArrayForward(UUID[] uuids) { - return service.getNewUUIDArray(uuids); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java deleted file mode 100644 index 46569311ff..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java +++ /dev/null @@ -1,207 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.osoa.sca.annotations.Service; - -/** - * An implementation of StandardTypesService. - * - * @version $Rev$ $Date$ - */ -@Service(interfaces={StandardTypesService.class}) -public class StandardTypesServiceImpl implements StandardTypesService { - public BigInteger getNewBigInteger(BigInteger bi) { - return bi.negate(); - } - - public BigInteger[] getNewBigIntegerArray(BigInteger[] bia) { - BigInteger[] resp = new BigInteger[bia.length]; - for(int i = 0; i < bia.length; ++i) { - resp[i] = bia[i].negate(); - } - return resp; - } - - public BigDecimal getNewBigDecimal(BigDecimal bd) { - return bd.negate(); - } - - public BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda) { - BigDecimal[] resp = new BigDecimal[bda.length]; - for(int i = 0; i < bda.length; ++i) { - resp[i] = bda[i].negate(); - } - return resp; - } - - public Calendar getNewCalendar(Calendar c) { - Calendar resp = (Calendar)c.clone(); - resp.add(Calendar.DAY_OF_MONTH, 5); - return resp; - } - - public Calendar[] getNewCalendarArray(Calendar[] ca) { - Calendar[] resp = new Calendar[ca.length]; - for(int i = 0; i < ca.length; ++i) { - resp[i] = getNewCalendar(ca[i]); - } - return resp; - } - - public Date getNewDate(Date d) { - return new Date(d.getTime() + 5*24*60*60*1000); - } - - public Date[] getNewDateArray(Date[] da) { - Date[] resp = new Date[da.length]; - for(int i = 0; i < da.length; ++i) { - resp[i] = getNewDate(da[i]); - } - return resp; - } - - public QName getNewQName(QName qname) { - return new QName(qname.getNamespaceURI()+"q", qname.getLocalPart()+"q", qname.getPrefix()+"q"); - - } - - public QName[] getNewQNameArray(QName[] qnames) { - QName[] resp = new QName[qnames.length]; - for(int i = 0; i < qnames.length; ++i) { - resp[i] = getNewQName(qnames[i]); - } - return resp; - } - - public URI getNewURI(URI uri) { - return uri.resolve("uri"); - } - - public URI[] getNewURIArray(URI[] uris) { - URI[] resp = new URI[uris.length]; - for(int i = 0; i < uris.length; ++i) { - resp[i] = getNewURI(uris[i]); - } - return resp; - } - - public XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal) { - xgcal = (XMLGregorianCalendar)xgcal.clone(); - xgcal.setDay(xgcal.getDay()+5); - return xgcal; - } - - public XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcals) { - XMLGregorianCalendar[] resp = new XMLGregorianCalendar[xgcals.length]; - for(int i = 0; i < xgcals.length; ++i) { - resp[i] = getNewXMLGregorianCalendar(xgcals[i]); - } - return resp; - } - - public Duration getNewDuration(Duration d) { - return d.negate(); - } - - public Duration[] getNewDurationArray(Duration[] da) { - Duration[] resp = new Duration[da.length]; - for(int i = 0; i < da.length; ++i) { - resp[i] = da[i].negate(); - } - return resp; - } - - public Object getNewObject(Object obj) { - return StandardTypesTransformer.getNewObject(obj); - } - - public Object[] getNewObjectArray(Object[] objs) { - Object[] resp = new Object[objs.length]; - for(int i = 0; i < objs.length; ++i) { - resp[i] = getNewObject(objs[i]); - } - return resp; - } - - public Image getNewImage(Image img) { - return StandardTypesTransformer.getNewImage(img); - } - - public Image[] getNewImageArray(Image[] imgs) { - Image[] resp = new Image[imgs.length]; - for(int i = 0; i < imgs.length; ++i) { - resp[i] = getNewImage(imgs[i]); - } - return resp; - } - - public DataHandler getNewDataHandler(DataHandler dh) { - // FIXME: transform the input - return dh; - } - - public DataHandler[] getNewDataHandlerArray(DataHandler[] dha) { - DataHandler[] resp = new DataHandler[dha.length]; - for(int i = 0; i < dha.length; ++i) { - resp[i] = dha[i]; - } - return resp; - } - - public Source getNewSource(Source src) { - return StandardTypesTransformer.getNewSource(src); - } - - public Source[] getNewSourceArray(Source[] srcs) { - Source[] resp = new Source[srcs.length]; - for(int i = 0; i < srcs.length; ++i) { - resp[i] = getNewSource(srcs[i]); - } - return resp; - } - - public UUID getNewUUID(UUID uuid) { - return UUID.fromString(uuid.toString()+"AAA"); - } - - public UUID[] getNewUUIDArray(UUID[] uuids) { - UUID[] resp = new UUID[uuids.length]; - for(int i = 0; i < uuids.length; ++i) { - resp[i] = getNewUUID(uuids[i]); - } - return resp; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java deleted file mode 100644 index 9d851455da..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * 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.databindings.jaxb.impl; - -import java.awt.Image; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.CharArrayReader; -import java.io.CharArrayWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; - -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamSource; - -import org.xml.sax.InputSource; - -/** - * StandardTypesTransformer class that provide for transforming input provided to StandardTypesService methods. - * - * @version $Rev$ $Date$ - */ -public class StandardTypesTransformer { - - public static Object getNewObject(Object obj) { - if(obj instanceof String) { - return "Hello "+obj; - } else if(obj instanceof Integer) { - return new Integer(-((Integer)obj).intValue()); - } else if(obj instanceof Double) { - return new Double(-((Double)obj).doubleValue()); - } - - return obj; - } - - /** - * Returns a copy of the source object if the input is DOMSource, SAXSource or StreamSource. - * Returns the input object as is for other types. - */ - public static Source getNewSource(Source src) { - Source ret = null; - if(src instanceof DOMSource) { - DOMSource dsrc = (DOMSource)src; - ret = new DOMSource(dsrc.getNode() != null ? dsrc.getNode().cloneNode(true) : null); - } else if(src instanceof SAXSource) { - SAXSource ssrc = (SAXSource)src; - if(ssrc.getInputSource().getByteStream() != null) { - InputStream inp = ssrc.getInputSource().getByteStream(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - int b; - try { - while((b = inp.read()) != -1) { - bout.write(b); - } - } catch (IOException ignored) { - } - try { bout.close();} catch (IOException ignored) {} - try { inp.reset();} catch (IOException ignored) {} - ret = new SAXSource(new InputSource(new ByteArrayInputStream(bout.toByteArray()))); - } else if(ssrc.getInputSource().getCharacterStream() != null) { - Reader rdr = ssrc.getInputSource().getCharacterStream(); - CharArrayWriter caw = new CharArrayWriter(); - try { - int c; - while((c = rdr.read()) != -1) { - caw.append((char)c); - } - } catch (IOException ignored) { - } - caw.close(); - try{ rdr.reset();} catch(IOException ignored) {} - ret = new SAXSource(new InputSource(new CharArrayReader(caw.toCharArray()))); - } else { - ret = new SAXSource(); - } - } else if(src instanceof StreamSource) { - StreamSource ssrc = (StreamSource)src; - if(ssrc.getInputStream() != null) { - InputStream inp = ssrc.getInputStream(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - int b; - try { - while((b = inp.read()) != -1) { - bout.write(b); - } - } catch (IOException ignored) { - } - try { bout.close();} catch (IOException ignored) {} - try { inp.reset();} catch (IOException ignored) {} - ret = new StreamSource(new ByteArrayInputStream(bout.toByteArray())); - } else if(ssrc.getReader() != null) { - Reader rdr = ssrc.getReader(); - CharArrayWriter caw = new CharArrayWriter(); - try { - int c; - while((c = rdr.read()) != -1) { - caw.append((char)c); - } - } catch (IOException ignored) { - } - caw.close(); - try{ rdr.reset();} catch(IOException ignored) {} - ret = new StreamSource(new CharArrayReader(caw.toCharArray())); - } else { - ret = new StreamSource(); - } - } - - if(ret != null) { - ret.setSystemId(src.getSystemId()); - } else { - ret = src; - } - return ret; - } - - public static Image getNewImage(Image arg) { - arg.getGraphics().drawOval(2, 2, 7, 7); - return arg; - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl deleted file mode 100644 index 926e4154aa..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl +++ /dev/null @@ -1,371 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite deleted file mode 100644 index afde4b7de9..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl deleted file mode 100644 index f366783e5e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl +++ /dev/null @@ -1,927 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite deleted file mode 100644 index f218419f45..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite deleted file mode 100644 index 59e30dc801..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl deleted file mode 100644 index 5bfd1ea277..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl +++ /dev/null @@ -1,1155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java deleted file mode 100644 index 7bb63fff1e..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java +++ /dev/null @@ -1,347 +0,0 @@ -/* - * 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.databindings.jaxb.topdown; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.Ignore; - -/** - * @version $Rev$ $Date$ - */ -public class DatabindingTestCase { - - private static SCAClient client; - private static SCANode node; - - /** - * Runs once before running the tests - */ - @BeforeClass - public static void setUp() throws Exception { - try { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/helloservice.composite", null); - node.start(); - client = (SCAClient)node; - }catch(Throwable e) { - e.printStackTrace(); - } - } - - /** - * Runs once after running the tests - */ - @AfterClass - public static void tearDown() { - node.stop(); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetings. - */ - @Test - public void testW2W() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTest(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testW2WArray() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestArray(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testW2WList() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testW2WArrayList() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestArrayList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testW2WMap() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testW2WHashMap() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestHashMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testW2WVarArgs() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestVarArgs(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetings. - */ - @Test - public void testJ2W() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTest(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testJ2WArray() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestArray(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testJ2WList() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testJ2WArrayList() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestArrayList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testJ2WMap() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testJ2WHashMap() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestHashMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testJ2WVarArgs() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestVarArgs(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetings. - */ - @Test - public void testW2J() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTest(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testW2JArray() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestArray(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testW2JList() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testW2JArrayList() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestArrayList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testW2JMap() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testW2JHashMap() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestHashMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testW2JVarArgs() throws Exception { - HelloServiceClient helloServiceClient = client.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestVarArgs(helloServiceClient); - } - - private void performTest(HelloServiceClient helloServiceClient) { - String name = "Pandu"; - String resp = helloServiceClient.getGreetingsForward(name); - Assert.assertEquals("Hello "+name, resp); - } - - private void performTestArray(HelloServiceClient helloServiceClient) { - String[] names = {"Me", "Pandu"}; - String[] resps = helloServiceClient.getGreetingsArrayForward(names); - for(int i = 0; i < names.length; ++i) { - Assert.assertEquals("Hello "+names[i], resps[i]); - } - } - - private void performTestList(HelloServiceClient helloServiceClient) { - List namesList = new ArrayList(); - namesList.add("Me"); - namesList.add("Pandu"); - namesList.add("Chinnipandu"); - List respList = helloServiceClient.getGreetingsListForward(namesList); - Assert.assertEquals(namesList.size(), respList.size()); - for(int i = 0; i < namesList.size(); ++i) { - Assert.assertEquals("Hello "+namesList.get(i), respList.get(i)); - } - } - - private void performTestArrayList(HelloServiceClient helloServiceClient) { - ArrayList namesList = new ArrayList(); - namesList.add("Me"); - namesList.add("Pandu"); - namesList.add("Chinnipandu"); - ArrayList respList = helloServiceClient.getGreetingsArrayListForward(namesList); - Assert.assertEquals(namesList.size(), respList.size()); - for(int i = 0; i < namesList.size(); ++i) { - Assert.assertEquals("Hello "+namesList.get(i), respList.get(i)); - } - } - - private void performTestMap(HelloServiceClient helloServiceClient) { - Map namesMap = new HashMap(); - namesMap.put("Me", null); - namesMap.put("Pandu", null); - namesMap.put("Chinnipandu", null); - Map respMap = helloServiceClient.getGreetingsMapForward(namesMap); - Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size()); - for(Map.Entry entry: namesMap.entrySet()) { - Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey())); - } - } - - private void performTestHashMap(HelloServiceClient helloServiceClient) { - HashMap namesMap = new HashMap(); - namesMap.put("Me", null); - namesMap.put("Pandu", null); - namesMap.put("Chinnipandu", null); - Map respMap = helloServiceClient.getGreetingsHashMapForward(namesMap); - Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size()); - for(Map.Entry entry: namesMap.entrySet()) { - Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey())); - } - } - - private void performTestVarArgs(HelloServiceClient helloServiceClient) { - String[] names = { "Me", "You", "Pandu" }; // Do not change the array size from 3. - String expected = "Hello Me You Pandu"; - String actual = helloServiceClient.getGreetingsVarArgsForward(names[0], names[1], names[2]); - Assert.assertEquals(expected, actual); - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java deleted file mode 100644 index eaf54b0f1b..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java +++ /dev/null @@ -1,849 +0,0 @@ -/* - * 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.databindings.jaxb.topdown; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.Ignore; - -/** - * @version $Rev$ $Date$ - */ -public class PrimitivesDatabindingTestCase { - - private static SCAClient domain; - private static SCANode node; - - /** - * Runs before each test method - */ - @BeforeClass - public static void setUp() throws Exception { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/primitivesservice.composite", null); - node.start(); - domain = (SCAClient)node; - } - - /** - * Runs after each test method - */ - @AfterClass - public static void tearDown() { - node.stop(); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testW2WNegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testW2WNegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for boolean array. - */ - @Test - public void testW2WPassByValueBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByte. - */ - @Test - public void testW2WNegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testW2WNegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for byte array. - */ - @Test - public void testW2WPassByValueByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueByteArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShort. - */ - @Test - public void testW2WNegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testW2WNegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for short array. - */ - @Test - public void testW2WPassByValueShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueShortArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateInt. - */ - @Test - public void testW2WNegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testW2WNegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for int array. - */ - @Test - public void testW2WPassByValueIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueIntArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLong. - */ - @Test - public void testW2WNegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testW2WNegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for long array. - */ - @Test - public void testW2WPassByValueLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueLongArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloat. - */ - @Test - public void testW2WNegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testW2WNegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for float array. - */ - @Test - public void testW2WPassByValueFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueFloatArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDouble. - */ - @Test - public void testW2WNegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testW2WNegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for double array. - */ - @Test - public void testW2WPassByValueDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testJ2WNegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testJ2WNegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for boolean array. - */ - @Test - public void testJ2WPassByValueBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByte. - */ - @Test - public void testJ2WNegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testJ2WNegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for byte array. - */ - @Test - public void testJ2WPassByValueByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueByteArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShort. - */ - @Test - public void testJ2WNegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testJ2WNegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for short array. - */ - @Test - public void testJ2WPassByValueShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueShortArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateInt. - */ - @Test - public void testJ2WNegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testJ2WNegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for int array. - */ - @Test - public void testJ2WPassByValueIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueIntArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLong. - */ - @Test - public void testJ2WNegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testJ2WNegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for long array. - */ - @Test - public void testJ2WPassByValueLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueLongArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloat. - */ - @Test - public void testJ2WNegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testJ2WNegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for float array. - */ - @Test - public void testJ2WPassByValueFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueFloatArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDouble. - */ - @Test - public void testJ2WNegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testJ2WNegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for double array. - */ - @Test - public void testJ2WPassByValueDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testW2JNegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testW2JNegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for boolean array. - */ - @Test - public void testW2JPassByValueBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByte. - */ - @Test - public void testW2JNegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testW2JNegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for byte array. - */ - @Test - public void testW2JPassByValueByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueByteArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShort. - */ - @Test - public void testW2JNegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testW2JNegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for short array. - */ - @Test - public void testW2JPassByValueShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueShortArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateInt. - */ - @Test - public void testW2JNegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testW2JNegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for int array. - */ - @Test - public void testW2JPassByValueIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueIntArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLong. - */ - @Test - public void testW2JNegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testW2JNegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for long array. - */ - @Test - public void testW2JPassByValueLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueLongArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloat. - */ - @Test - public void testW2JNegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testW2JNegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for float array. - */ - @Test - public void testW2JPassByValueFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueFloatArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDouble. - */ - @Test - public void testW2JNegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testW2JNegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for double array. - */ - @Test - public void testW2JPassByValueDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = domain.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray()); - } - - private void performTestNegateBoolean(PrimitivesServiceClient primitivesServiceClient) { - Assert.assertTrue(primitivesServiceClient.negateBooleanForward(false)); - Assert.assertFalse(primitivesServiceClient.negateBooleanForward(true)); - } - - private void performTestNegateBooleanArray(PrimitivesServiceClient primitivesServiceClient) { - boolean flags[] = new boolean[2]; - flags[0] = false; - flags[1] = true; - boolean[] respFlags = primitivesServiceClient.negateBooleanArrayForward(flags); - Assert.assertEquals(flags.length, respFlags.length); - for(int i = 0; i < flags.length; ++i) { - Assert.assertEquals(!flags[i], respFlags[i]); - } - } - - private void performTestNegateByte(PrimitivesServiceClient primitivesServiceClient) { - byte[] ba = new byte[3]; - ba[0] = -1; - ba[1] = 0; - ba[2] = 1; - - for(int i = 0; i < ba.length; ++i) { - Assert.assertEquals((byte)-ba[i], primitivesServiceClient.negateByteForward(ba[i])); - } - } - - private void performTestNegateByteArray(PrimitivesServiceClient primitivesServiceClient) { - byte[] ba = new byte[3]; - ba[0] = -1; - ba[1] = 0; - ba[2] = 1; - - byte[] r = primitivesServiceClient.negateByteArrayForward(ba); - Assert.assertEquals(ba.length, r.length); - for(int i = 0; i < ba.length; ++i) { - Assert.assertEquals((byte)-ba[i], r[i]); - } - } - - private void performTestNegateShort(PrimitivesServiceClient primitivesServiceClient) { - short[] s = new short[3]; - s[0] = -1; - s[1] = 0; - s[2] = 1; - - for(int i = 0; i < s.length; ++i) { - Assert.assertEquals((short)-s[i], primitivesServiceClient.negateShortForward(s[i])); - } - } - - private void performTestNegateShortArray(PrimitivesServiceClient primitivesServiceClient) { - short[] s = new short[3]; - s[0] = -1; - s[1] = 0; - s[2] = 1; - - short[] r = primitivesServiceClient.negateShortArrayForward(s); - Assert.assertEquals(s.length, r.length); - for(int i = 0; i < s.length; ++i) { - Assert.assertEquals((short)-s[i], r[i]); - } - } - - private void performTestNegateInt(PrimitivesServiceClient primitivesServiceClient) { - int[] ia = new int[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], primitivesServiceClient.negateIntForward(ia[i])); - } - } - - private void performTestNegateIntArray(PrimitivesServiceClient primitivesServiceClient) { - int[] ia = new int[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - int[] r = primitivesServiceClient.negateIntArrayForward(ia); - Assert.assertEquals(ia.length, r.length); - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], r[i]); - } - } - - private void performTestNegateLong(PrimitivesServiceClient primitivesServiceClient) { - long[] la = new long[3]; - la[0] = -1; - la[1] = 0; - la[2] = 1; - - for(int i = 0; i < la.length; ++i) { - Assert.assertEquals(-la[i], primitivesServiceClient.negateLongForward(la[i])); - } - } - - private void performTestNegateLongArray(PrimitivesServiceClient primitivesServiceClient) { - long[] la = new long[3]; - la[0] = -1; - la[1] = 0; - la[2] = 1; - - long[] r = primitivesServiceClient.negateLongArrayForward(la); - Assert.assertEquals(la.length, r.length); - for(int i = 0; i < la.length; ++i) { - Assert.assertEquals(-la[i], r[i]); - } - } - - private void performTestNegateFloat(PrimitivesServiceClient primitivesServiceClient) { - float[] fa = new float[3]; - fa[0] = -1; - fa[1] = 0; - fa[2] = 1; - - for(int i = 0; i < fa.length; ++i) { - Assert.assertEquals(-fa[i], primitivesServiceClient.negateFloatForward(fa[i])); - } - } - - private void performTestNegateFloatArray(PrimitivesServiceClient primitivesServiceClient) { - float[] ia = new float[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - float[] r = primitivesServiceClient.negateFloatArrayForward(ia); - Assert.assertEquals(ia.length, r.length); - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], r[i]); - } - } - - private void performTestNegateDouble(PrimitivesServiceClient primitivesServiceClient) { - double[] da = new double[3]; - da[0] = -1; - da[1] = 0; - da[2] = 1; - - for(int i = 0; i < da.length; ++i) { - Assert.assertEquals(-da[i], primitivesServiceClient.negateDoubleForward(da[i])); - } - } - - private void performTestNegateDoubleArray(PrimitivesServiceClient primitivesServiceClient) { - double[] da = new double[3]; - da[0] = -1; - da[1] = 0; - da[2] = 1; - - double[] r = primitivesServiceClient.negateDoubleArrayForward(da); - Assert.assertEquals(da.length, r.length); - for(int i = 0; i < da.length; ++i) { - Assert.assertEquals(-da[i], r[i]); - } - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java deleted file mode 100644 index 4713179267..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java +++ /dev/null @@ -1,1446 +0,0 @@ -/* - * 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.databindings.jaxb.topdown; - -import java.awt.Image; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringReader; -import java.io.StringWriter; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.net.URL; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.TimeZone; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; - -import junit.framework.Assert; - -import org.apache.axiom.attachments.ByteArrayDataSource; -import org.apache.tuscany.sca.databinding.xml.String2Node; -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.xml.sax.InputSource; -import org.junit.Ignore; - -/** - * @version $Rev$ $Date$ - */ -public class StandardTypesDatabindingTestCase { - - private static SCAClient domain; - private static SCANode node; - - /** - * Runs once before the tests - */ - @BeforeClass - public static void setUp() throws Exception { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/standard-types-service.composite", null); - node.start(); - domain = (SCAClient)node; - } - - /** - * Runs once after the tests - */ - @AfterClass - public static void tearDown() { - node.stop(); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testW2WNewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testW2WNewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testW2WNewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testW2WNewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testW2WNewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testW2WNewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDate. - */ - @Test - public void testW2WNewDate() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testW2WNewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQName. - */ - @Test - public void testW2WNewQName() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testW2WNewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURI. - */ - @Test - public void testW2WNewURI() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testW2WNewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testW2WNewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testW2WNewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testW2WNewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testW2WNewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObject. - */ - @Test - public void testW2WNewObject() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testW2WNewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImage. - */ - @Test - public void testW2WNewImage() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testW2WNewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testW2WNewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testW2WNewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSource. - */ - @Test - //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A>") - public void testW2WNewSource() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewSource(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSourceArray. - */ - @Test - @Ignore("TUSCANY-2452") - public void testW2WNewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewSourceArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testW2WNewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testW2WNewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewUUIDArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testJ2WNewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testJ2WNewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testJ2WNewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testJ2WNewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testJ2WNewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testJ2WNewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDate. - */ - @Test - public void testJ2WNewDate() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testJ2WNewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQName. - */ - @Test - public void testJ2WNewQName() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testJ2WNewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURI. - */ - @Test - public void testJ2WNewURI() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testJ2WNewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testJ2WNewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testJ2WNewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testJ2WNewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testJ2WNewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObject. - */ - @Test - public void testJ2WNewObject() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testJ2WNewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImage. - */ - @Test - public void testJ2WNewImage() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testJ2WNewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testJ2WNewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testJ2WNewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSource. - */ - @Test - //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A>") - public void testJ2WNewSource() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewSource(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSourceArray. - */ - @Test - @Ignore("TUSCANY-2452") - public void testJ2WNewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewSourceArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testJ2WNewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testJ2WNewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewUUIDArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testW2JNewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testW2JNewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testW2JNewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testW2JNewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testW2JNewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testW2JNewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDate. - */ - @Test - public void testW2JNewDate() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testW2JNewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQName. - */ - @Test - public void testW2JNewQName() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testW2JNewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURI. - */ - @Test - public void testW2JNewURI() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testW2JNewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testW2JNewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testW2JNewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testW2JNewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testW2JNewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObject. - */ - @Test - public void testW2JNewObject() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testW2JNewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImage. - */ - @Test - public void testW2JNewImage() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testW2JNewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testW2JNewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testW2JNewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSource. - */ - @Test - //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A>") - public void testW2JNewSource() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewSource(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSourceArray. - */ - @Test - @Ignore("TUSCANY-2452") - public void testW2JNewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewSourceArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testW2JNewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testW2JNewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewUUIDArray(serviceClient); - } - - private void performTestNewBigInteger(StandardTypesServiceClient serviceClient) { - BigInteger bi = new BigInteger("1234567890123456789012345678901234"); - BigInteger expected = bi.negate(); - BigInteger actual = serviceClient.getNewBigIntegerForward(bi); - Assert.assertEquals(expected, actual); - } - - private void performTestNewBigIntegerArray(StandardTypesServiceClient serviceClient) { - BigInteger[] bia = new BigInteger[2]; - bia[0] = new BigInteger("1234567890123456789012345678901234"); - bia[1] = new BigInteger("-98765432109876543210987654321"); - BigInteger[] actual = serviceClient.getNewBigIntegerArrayForward(bia); - Assert.assertEquals(bia.length, actual.length); - for (int i = 0; i < bia.length; ++i) { - Assert.assertEquals(bia[i].negate(), actual[i]); - } - } - - private void performTestNewBigDecimal(StandardTypesServiceClient serviceClient) { - BigDecimal bd = new BigDecimal("12345678901234567890.12345678901234"); - BigDecimal expected = bd.negate(); - BigDecimal actual = serviceClient.getNewBigDecimalForward(bd); - Assert.assertEquals(expected, actual); - } - - private void performTestNewBigDecimalArray(StandardTypesServiceClient serviceClient) { - BigDecimal[] bda = new BigDecimal[2]; - bda[0] = new BigDecimal("1234567890123456.789012345678901234"); - bda[1] = new BigDecimal("-987654321098765.43210987654321"); - BigDecimal[] actual = serviceClient.getNewBigDecimalArrayForward(bda); - Assert.assertEquals(bda.length, actual.length); - for (int i = 0; i < bda.length; ++i) { - Assert.assertEquals(bda[i].negate(), actual[i]); - } - } - - private void performTestNewCalendar(StandardTypesServiceClient serviceClient) { - Calendar[] ca = new Calendar[3]; - String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"}; - for (int i = 0; i < ca.length; ++i) { - ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i])); - ca[i].set(Calendar.DAY_OF_MONTH, i + 1); - } - for (int i = 0; i < ca.length; ++i) { - Calendar actual = serviceClient.getNewCalendarForward(ca[i]); - ca[i].add(Calendar.DAY_OF_MONTH, 5); - if (actual instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) { - // FIXME: Is this a problem? - // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover - // different from the instance passed. Adjust the gregorianCutover as per the input instance. - ((GregorianCalendar)actual).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange()); - } - Assert.assertEquals(ca[i], actual); - } - } - - private void performTestNewCalendarArray(StandardTypesServiceClient serviceClient) { - Calendar[] ca = new Calendar[3]; - String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"}; - for (int i = 0; i < ca.length; ++i) { - ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i])); - ca[i].set(Calendar.DAY_OF_MONTH, i + 1); - } - Calendar[] actual = serviceClient.getNewCalendarArrayForward(ca); - Assert.assertEquals(ca.length, actual.length); - for (int i = 0; i < ca.length; ++i) { - ca[i].add(Calendar.DAY_OF_MONTH, 5); - if (actual[i] instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) { - // FIXME: Is this a problem? - // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover - // different from the instance passed. Adjust the gregorianCutover as per the input instance. - ((GregorianCalendar)actual[i]).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange()); - } - Assert.assertEquals(ca[i], actual[i]); - } - } - - private void performTestNewDate(StandardTypesServiceClient serviceClient) { - Date d = new Date(); - Date expected = new Date(d.getTime() + 5 * 24 * 60 * 60 * 1000); - Date actual = serviceClient.getNewDateForward(d); - Assert.assertEquals(expected, actual); - } - - private void performTestNewDateArray(StandardTypesServiceClient serviceClient) { - Date[] d = new Date[2]; - Date[] expected = new Date[d.length]; - for (int i = 0; i < d.length; ++i) { - d[i] = new Date(); - d[i].setTime(d[i].getTime() + i * 24 * 60 * 60 * 1000); - expected[i] = new Date(d[i].getTime() + 5 * 24 * 60 * 60 * 1000); - } - Date[] actual = serviceClient.getNewDateArrayForward(d); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < expected.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewQName(StandardTypesServiceClient serviceClient) { - QName[] qnames = new QName[3]; - qnames[0] = new QName("localPart"); - qnames[1] = new QName("namespaceUri", "localPart"); - qnames[2] = new QName("namespaceUri", "localPart", "prefix"); - QName[] expected = new QName[qnames.length]; - for (int i = 0; i < qnames.length; ++i) { - expected[i] = - new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q", - qnames[i].getPrefix() + "q"); - } - for (int i = 0; i < qnames.length; ++i) { - QName actual = serviceClient.getNewQNameForward(qnames[i]); - Assert.assertEquals(expected[i], actual); - } - } - - private void performTestNewQNameArray(StandardTypesServiceClient serviceClient) { - QName[] qnames = new QName[4]; - qnames[0] = new QName("localPart"); - qnames[1] = new QName("namespaceUri", "localPart"); - qnames[2] = new QName("namespaceUri", "localPart", "prefix"); - qnames[3] = new QName("localPart2"); - QName[] expected = new QName[qnames.length]; - for (int i = 0; i < qnames.length; ++i) { - expected[i] = - new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q", - qnames[i].getPrefix() + "q"); - } - QName[] actual = serviceClient.getNewQNameArrayForward(qnames); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < qnames.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewURI(StandardTypesServiceClient serviceClient) { - URI[] uris = new URI[4]; - uris[0] = URI.create("a/b/c"); - uris[1] = URI.create("http://abc/"); - uris[2] = URI.create("ftp://a/b"); - uris[3] = URI.create("http://abc/").resolve("xyz"); - - for (int i = 0; i < uris.length; ++i) { - URI expected = uris[i].resolve("uri"); - URI actual = serviceClient.getNewURIForward(uris[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewURIArray(StandardTypesServiceClient serviceClient) { - URI[] uris = new URI[4]; - uris[0] = URI.create("a/b/c"); - // [rfeng] We need to have a trialign / to avoid the resolving problem - // FIXME: [vamsi] This is actually a data transformation problem. The array being returned from the service method is - // not making to the caller intact. - uris[1] = URI.create("http://abc/"); - uris[2] = URI.create("ftp://a/b"); - uris[3] = URI.create("http://abc/").resolve("xyz"); - - URI[] expected = new URI[uris.length]; - for (int i = 0; i < uris.length; ++i) { - expected[i] = uris[i].resolve("uri"); - } - - URI[] actual = serviceClient.getNewURIArrayForward(uris); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < uris.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewXMLGregorianCalendar(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3]; - xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19)); - xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13)); - xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16)); - - for (int i = 0; i < xgcals.length; ++i) { - XMLGregorianCalendar actual = serviceClient.getNewXMLGregorianCalendarForward(xgcals[i]); - xgcals[i].setDay(xgcals[i].getDay() + 5); - Assert.assertEquals(xgcals[i], actual); - } - } - - private void performTestNewXMLGregorianCalendarArray(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3]; - xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19)); - xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13)); - xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16)); - - XMLGregorianCalendar[] actual = serviceClient.getNewXMLGregorianCalendarArrayForward(xgcals); - Assert.assertEquals(xgcals.length, actual.length); - for (int i = 0; i < xgcals.length; ++i) { - xgcals[i].setDay(xgcals[i].getDay() + 5); - Assert.assertEquals(xgcals[i], actual[i]); - } - } - - private void performTestNewDuration(StandardTypesServiceClient serviceClient) throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - Duration[] da = new Duration[3]; - da[0] = df.newDuration(1000000000000L); - da[1] = df.newDurationDayTime(1000000000000L); - da[2] = df.newDurationYearMonth(true, 1, 3); - - for (int i = 0; i < da.length; ++i) { - Assert.assertEquals(da[i].negate(), serviceClient.getNewDurationForward(da[i])); - } - } - - private void performTestNewObject(StandardTypesServiceClient serviceClient) { - Object[] objs = new Object[5]; - objs[0] = "Hello"; - objs[1] = 10; - objs[2] = null; - objs[3] = -1.0; - objs[4] = null; - - for (int i = 0; i < objs.length; ++i) { - Object expected = StandardTypesTransformer.getNewObject(objs[i]); - Object actual = serviceClient.getNewObjectForward(objs[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewObjectArray(StandardTypesServiceClient serviceClient) { - Object[] objs = new Object[5]; - objs[0] = "Hello"; - objs[1] = 10; - objs[2] = null; - objs[3] = -1.0; - objs[4] = null; - - Object[] actual = serviceClient.getNewObjectArrayForward(objs); - Assert.assertEquals(objs.length, actual.length); - for (int i = 0; i < objs.length; ++i) { - Object expected = StandardTypesTransformer.getNewObject(objs[i]); - Assert.assertEquals(expected, actual[i]); - } - } - - private void performTestNewImage(StandardTypesServiceClient serviceClient) throws InterruptedException { - // Create some images to test with. - Image[] imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - Image[] copy = imgs; - // Create the same images once again as the StandardTypesTransformer may manipulate the image passed. - imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - // Make sure the images and copies are equal using ImageInfo - for(int i = 0; i < imgs.length; ++i) { - Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i])); - } - - for (int i = 0; i < imgs.length; ++i) { - Image actual = serviceClient.getNewImageForward(imgs[i]); - Image expected = StandardTypesTransformer.getNewImage(copy[i]); - // Compare using ImageInfo - Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual)); - } - } - - private void performTestNewImageArray(StandardTypesServiceClient serviceClient) throws InterruptedException { - // Create some images to test with. - Image[] imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - Image[] copy = imgs; - // Create the same images once again as the StandardTypesTransformer may manipulate the image passed. - imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - // Make sure the images and copies are equal using ImageInfo - for(int i = 0; i < imgs.length; ++i) { - Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i])); - } - - Image[] actual = serviceClient.getNewImageArrayForward(imgs); - Assert.assertEquals(imgs.length, actual.length); - for (int i = 0; i < imgs.length; ++i) { - Image expected = StandardTypesTransformer.getNewImage(copy[i]); - // Compare using ImageInfo - Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual[i])); - } - } - - private void performTestNewDurationArray(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - Duration[] da = new Duration[3]; - da[0] = df.newDuration(1000000000000L); - da[1] = df.newDurationDayTime(1000000000000L); - da[2] = df.newDurationYearMonth(true, 1, 3); - - Duration[] actual = serviceClient.getNewDurationArrayForward(da); - Assert.assertEquals(da.length, actual.length); - for (int i = 0; i < da.length; ++i) { - Assert.assertEquals(da[i].negate(), actual[i]); - } - } - - private void performTestNewDataHandler(StandardTypesServiceClient serviceClient) throws IOException { - DataHandler[] dha = new DataHandler[3]; - dha[0] = new DataHandler("Some data", "text/plain"); - dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html")); - dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes())); - - for (int i = 0; i < dha.length; ++i) { - DataHandler actual = serviceClient.getNewDataHandlerForward(dha[i]); - // Note: The DataHandler returned may use a different type of DataSource. - // Compare the data content instead of using equals(). - Assert.assertTrue(compare(dha[i], actual)); - } - } - - private void performTestNewDataHandlerArray(StandardTypesServiceClient serviceClient) throws IOException { - DataHandler[] dha = new DataHandler[3]; - dha[0] = new DataHandler("Some data", "text/plain"); - dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html")); - dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes())); - - DataHandler[] actual = serviceClient.getNewDataHandlerArrayForward(dha); - Assert.assertEquals(dha.length, actual.length); - for (int i = 0; i < dha.length; ++i) { - // Note: The DataHandler returned may use a different type of DataSource. - // Compare the data content instead of using equals(). - Assert.assertTrue(compare(dha[i], actual[i])); - } - } - - private void performTestNewSource(StandardTypesServiceClient serviceClient) throws Exception { - String xml = "ABC"; - Source[] srcs = new Source[3]; - srcs[0] = new DOMSource(new String2Node().transform(xml, null)); - srcs[1] = new SAXSource(new InputSource(new StringReader(xml))); - srcs[2] = new StreamSource(new StringReader(xml)); - - for (int i = 0; i < srcs.length; ++i) { - Source expected = StandardTypesTransformer.getNewSource(srcs[i]); - Source actual = serviceClient.getNewSourceForward(srcs[i]); - // [rfeng] The data may come back as a different source - Assert.assertEquals(sourceToString(expected), sourceToString(actual)); - } - } - - private void performTestNewSourceArray(StandardTypesServiceClient serviceClient) throws Exception { - String xml = "ABC"; - Source[] srcs = new Source[3]; - srcs[0] = new DOMSource(new String2Node().transform(xml, null)); - srcs[1] = new SAXSource(new InputSource(new StringReader(xml))); - srcs[2] = new StreamSource(new StringReader(xml)); - - Source[] actual = serviceClient.getNewSourceArrayForward(srcs); - Source[] expected = new Source[srcs.length]; - for(int i = 0; i < srcs.length; ++i) { - expected[i] = StandardTypesTransformer.getNewSource(srcs[i]); - } - Assert.assertEquals(srcs.length, actual.length); - for (int i = 0; i < srcs.length; ++i) { - // [rfeng] The data may come back as a different source - Assert.assertEquals(sourceToString(expected[i]), sourceToString(actual[i])); - } - - } - - private void performTestNewUUID(StandardTypesServiceClient serviceClient) { - UUID[] uuids = new UUID[3]; - uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes()); - uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes()); - uuids[2] = UUID.randomUUID(); - - for (int i = 0; i < uuids.length; ++i) { - UUID expected = UUID.fromString(uuids[i].toString() + "AAA"); - UUID actual = serviceClient.getNewUUIDForward(uuids[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewUUIDArray(StandardTypesServiceClient serviceClient) { - UUID[] uuids = new UUID[3]; - uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes()); - uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes()); - uuids[2] = UUID.randomUUID(); - - UUID[] actual = serviceClient.getNewUUIDArrayForward(uuids); - for (int i = 0; i < uuids.length; ++i) { - UUID expected = UUID.fromString(uuids[i].toString() + "AAA"); - Assert.assertEquals(expected, actual[i]); - } - } - - /** - * This method compares two DataHandlers. - * @return true if the data in the two handlers is the same. - */ - private boolean compare(DataHandler dh1, DataHandler dh2) throws IOException { - InputStream inp1 = dh1.getInputStream(); - InputStream inp2 = dh2.getInputStream(); - for(;;) { - int i1 = inp1.read(); - int i2 = inp2.read(); - if(i1 == -1 && i2 == -1) { - return true; - } else if(i1 != -1 && i2 != -1) { - if(i1 != i2) { - return false; - } - } else { - return false; - } - } - } - - /** - * This method returns the content of a source object as String. - */ - private String sourceToString(Source s) throws Exception { - StringWriter sw = new StringWriter(); - Result r = new StreamResult(sw); - TransformerFactory.newInstance().newTransformer().transform(s, r); - sw.close(); - return sw.toString(); - } - - /** - * This class initializes with the width, height and pixel data of a java.awt.Image object. - */ - private static class ImageInfo { - private int h, w, pixels[]; - public ImageInfo(Image img) throws InterruptedException { - w = img.getWidth(null); - h = img.getHeight(null); - pixels = new int[w*h]; - PixelGrabber pg = new PixelGrabber(img, 0, 0, w, h, pixels, 0, w); - pg.grabPixels(); - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } else if(!(that instanceof ImageInfo)) { - return false; - } - - ImageInfo that1 = (ImageInfo)that; - if(w != that1.w || h != that1.h || pixels == null || that1.pixels == null || pixels.length != that1.pixels.length) { - return false; - } - for(int i = 0; i < pixels.length; ++i) { - if(pixels[i] != that1.pixels[i]) { - return false; - } - } - return true; - } - - public String toString() { - return this.getClass().getSimpleName()+"[w = "+w+", h = "+h+", pixels = "+pixels+"]"; - } - } -} diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxbgen/pom.xml b/tags/java/sca/1.5.1/itest/databindings/jaxbgen/pom.xml deleted file mode 100644 index b1f71c57fa..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxbgen/pom.xml +++ /dev/null @@ -1,262 +0,0 @@ - - - - - org.apache.tuscany.sca - itest-databindings - 1.5.1 - - - 4.0.0 - - itest-databindings-jaxb - 1.5.1 - jar - Apache Tuscany SCA iTest JAXB Databinding - - - - - true - - java.net - java.net Maven 1.x Repository - http://download.java.net/maven/1 - legacy - - - java.net2 - java.net Maven 2.x Repository - http://download.java.net/maven/2 - - - - - - java.net2 - java.net Maven 2.x Repository - http://download.java.net/maven/2 - - - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - ${pom.version} - runtime - - - org.apache.tuscany.sca - tuscany-databinding-jaxb - ${pom.version} - runtime - - - org.apache.tuscany.sca - tuscany-databinding-sdo - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-databinding-axiom - ${pom.version} - compile - - - org.apache.tuscany.sca - itest-databindings-common - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-host-embedded - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-interface-java-xml - ${pom.version} - compile - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.5.1 - runtime - - - javax.xml.bind - jaxb-api - 2.1 - compile - - - - com.sun.xml.ws - jaxws-rt - 2.1.3 - - - - commons-collections - commons-collections - 3.1 - - - log4j - log4j - 1.2.12 - provided - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Djava.endorsed.dirs=target/endorsed - - - - org.apache.maven.plugins - maven-dependency-plugin - - - generate-sources - - unpack - - - - - org.apache.tuscany.sca - itest-databindings-common - ${project.version} - true - ${project.build.directory}/classes - - - - - - copy - generate-sources - - copy - - - - - javax.xml.ws - jaxws-api - 2.1 - jar - - - javax.xml.bind - jaxb-api - 2.1 - jar - - - ${project.build.directory}/endorsed - false - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.0 - - - add-test-source - generate-sources - - add-test-source - - - - target/jaxws-source - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - generate-test-source - process-resources - - java - - - - - org.apache.tuscany.sca.itest.generate.Generate - - ${project.build.directory} - - - - - org.codehaus.mojo - jaxws-maven-plugin - 1.9 - - - process-resources - - wsimport - - - - - org.apache.tuscany.sca.itest.jaxbdatabinding.generated - ${project.build.directory}/classes/wsdl - - Greeter.wsdl - - ${project.build.directory}/jaxws-source - false - true - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml deleted file mode 100644 index 8381a164ea..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - - - Person.xsd - xsd - org.apache.tuscany.sca.itest.jaxbdatabinding.generated - ObjectFactory - http://apache.org/tuscany/sca/itest/databinding/types - p - - PersonType - - ObjectFactory factory = new ObjectFactory(); - param = factory.createPersonType(); - param.setFirstName("George"); - param.setLastName("Doors"); - - - param.setGreeting("Hello"); - - - assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting()); - - - - - Interop.xsd - xsd - org.apache.tuscany.sca.itest.jaxbdatabinding.generated - ObjectFactory - http://www.apache.org/tuscany/interop - i - - - AttributeComplexType - - ObjectFactory factory = new ObjectFactory(); - org.apache.tuscany.sca.itest.jaxbdatabinding.generated.AttributeType attrib = factory.createAttributeType(); - attrib.setAttribute("SomeText"); - param = factory.createAttributeComplexType(); - param.setAttributeElement(attrib); - - - param.getAttributeElement().setAttribute("SomeChangedText");; - - - assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute()); - - - - AttributeReferenceComplexType - - ObjectFactory factory = new ObjectFactory(); - param = factory.createAttributeReferenceComplexType(); - - param.setReferencedAttribute("SomeText"); - - - param.setReferencedAttribute("SomeChangedText");; - - - assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute()); - - - - SimpleTypeWithAbstractComplexType - - ObjectFactory factory = new ObjectFactory(); - param = factory.createSimpleTypeWithAbstractComplexType(); - param.setSimpleTypeWithAbstractExtensionElement("SomeText"); - - - param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");; - - - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement()); - - - - SimpleTypeWithNameComplexType - - ObjectFactory factory = new ObjectFactory(); - param = factory.createSimpleTypeWithNameComplexType(); - param.setSimpleTypeWithNameElement("SomeText"); - - - param.setSimpleTypeWithNameElement("SomeChangedText");; - - - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement()); - - - - ComplexTypeWithContentType - - ObjectFactory factory = new ObjectFactory(); - param = factory.createComplexTypeWithContentType(); - param.setSimpleTypeWithName("SomeText"); - - - param.setSimpleTypeWithName("SomeChangedText");; - - - assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName()); - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite deleted file mode 100644 index ae0740e6fe..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/1.5.1/itest/databindings/pom.xml b/tags/java/sca/1.5.1/itest/databindings/pom.xml deleted file mode 100644 index 54c1623e32..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - org.apache.tuscany.sca - tuscany-itest - 1.5.1 - ../pom.xml - - 4.0.0 - - org.apache.tuscany.sca - itest-databindings - Apache Tuscany SCA Databindings Integration Tests - 1.5.1 - - - pom - - install - - - common - sdogen - jaxbgen - jaxb-bottom-up - jaxb-top-down - interop - - diff --git a/tags/java/sca/1.5.1/itest/databindings/readme.html b/tags/java/sca/1.5.1/itest/databindings/readme.html deleted file mode 100644 index 24a44e4ed7..0000000000 --- a/tags/java/sca/1.5.1/itest/databindings/readme.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - Tuscany SCA Integration Test Databindings - - - - - -

Tuscany SCA Integation Test Databindings

- -

Overview

- -

-This integration test tests the Tuscany SCA databinding implementation by passing various data structures -across various bindings using the supported databindings. There are tests for the individual databindings -which exercise various bindings with the same databinding at client and server ends of each binding. There -is also an integration test which exercises the transformer chains by specifying different databindings at -client and server ends of the binding. -

-

-In doing this testing it is apparent that there is a lot of repetition in creating client, services, idl and -type for each of the data types for each of the bindings for each of the databindings. To reduce the amount -of effort required to maintain the tests as new types, bindings and databindings are added the test cases -themselves are generated from configuration files. -

- -

Test Structure

- -Databindings/Common - hold files common across all tests
-Databindings/Interop - test the transformer chains with combinations of databindings
-Databindings/sdogen and jaxbgen - test each databindings independently
- -

Test Generation

-

-To reduce the amount of manual effort involved in building and maintaining tests cases the test cases -themselves are generated at run time using a set of velocity templates. Each test module has a generate.xml -file in the resources/generate directory which tells the generator what to do. The file looks like this. -

- -

-Each