From 6fadbc9cd1fcf03d0b3630f772d91df149b70428 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:07:19 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835123 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-java-1.0.1/itest/admin/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/admin/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/admin/NOTICE | 6 - branches/sca-java-1.0.1/itest/admin/README | 28 - branches/sca-java-1.0.1/itest/admin/pom.xml | 60 -- .../tuscany/sca/itest/admin/MyListService.java | 28 - .../sca/itest/admin/MyListServiceByYear.java | 27 - .../tuscany/sca/itest/admin/MyListServiceImpl.java | 88 -- .../apache/tuscany/sca/itest/admin/MyLogger.java | 36 - .../apache/tuscany/sca/itest/admin/MyService.java | 28 - .../tuscany/sca/itest/admin/MyServiceByDate.java | 29 - .../tuscany/sca/itest/admin/MyServiceImpl.java | 132 --- .../tuscany/sca/itest/admin/MyTotalService.java | 25 - .../sca/itest/admin/MyTotalServiceImpl.java | 93 -- .../sca/itest/admin/SCAComponentService.java | 28 - .../admin/MySimpleServiceInRecursiveTestCase.java | 80 -- .../sca/itest/admin/MySimpleServiceTestCase.java | 76 -- .../sca/itest/admin/MyTotalServiceTestCase.java | 67 -- .../test/resources/Iteration1Composite.composite | 43 - .../test/resources/Iteration3Composite.composite | 68 -- .../src/test/resources/MySimpleService.composite | 59 -- .../itest/callablereferences/DISCLAIMER | 8 - .../itest/callablereferences/LICENSE | 205 ---- .../sca-java-1.0.1/itest/callablereferences/NOTICE | 6 - .../itest/callablereferences/pom.xml | 81 -- .../tuscany/sca/itest/callableref/AComponent.java | 35 - .../sca/itest/callableref/AComponentImpl.java | 88 -- .../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 | 28 - .../sca/itest/callableref/DComponentImpl.java | 52 - .../main/resources/CallableReferenceTest.composite | 45 - .../src/main/resources/nodeA/CompositeA.composite | 47 - .../resources/nodeA/META-INF/sca-contribution.xml | 22 - .../src/main/resources/nodeB/CompositeB.composite | 34 - .../resources/nodeB/META-INF/sca-contribution.xml | 22 - .../CallableReferenceRemoteTestCase.java | 131 --- .../callableref/CallableReferenceTestCase.java | 83 -- .../sca-java-1.0.1/itest/callback-api/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/callback-api/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/callback-api/NOTICE | 6 - branches/sca-java-1.0.1/itest/callback-api/pom.xml | 45 - .../tuscany/sca/test/CallBackApiCallBack.java | 33 - .../apache/tuscany/sca/test/CallBackApiClient.java | 28 - .../tuscany/sca/test/CallBackApiClientImpl.java | 159 --- .../tuscany/sca/test/CallBackApiService.java | 37 - .../tuscany/sca/test/CallBackApiServiceImpl.java | 91 -- .../src/main/resources/CallBackApiTest.composite | 33 - .../tuscany/sca/test/CallBackApiTestCase.java | 46 - .../sca-java-1.0.1/itest/callback-basic/DISCLAIMER | 8 - .../sca-java-1.0.1/itest/callback-basic/LICENSE | 205 ---- .../sca-java-1.0.1/itest/callback-basic/NOTICE | 6 - .../sca-java-1.0.1/itest/callback-basic/pom.xml | 45 - .../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 - .../tuscany/sca/test/CallBackBasicTestCase.java | 47 - .../itest/callback-complex-type/DISCLAIMER | 8 - .../itest/callback-complex-type/LICENSE | 205 ---- .../itest/callback-complex-type/NOTICE | 6 - .../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 - .../sca-java-1.0.1/itest/callback-id/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/callback-id/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/callback-id/NOTICE | 6 - branches/sca-java-1.0.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 - .../itest/callback-multiple-wires/DISCLAIMER | 8 - .../itest/callback-multiple-wires/LICENSE | 205 ---- .../itest/callback-multiple-wires/NOTICE | 6 - .../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 | 51 - .../main/resources/CallbackMultiWireTest.composite | 38 - .../test/callback/CallbackMultiWireTestCase.java | 55 - .../itest/callback-set-callback/DISCLAIMER | 8 - .../itest/callback-set-callback/LICENSE | 205 ---- .../itest/callback-set-callback/NOTICE | 6 - .../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 | 75 -- .../resources/CallBackSetCallbackTest.composite | 37 - .../sca/test/CallBackSetCallbackTestCase.java | 49 - .../itest/callback-set-conversation/DISCLAIMER | 8 - .../itest/callback-set-conversation/LICENSE | 205 ---- .../itest/callback-set-conversation/NOTICE | 6 - .../itest/callback-set-conversation/pom.xml | 45 - .../test/CallBackSetCallbackConvBadCallback.java | 38 - .../sca/test/CallBackSetCallbackConvCallback.java | 34 - .../sca/test/CallBackSetCallbackConvClient.java | 28 - .../test/CallBackSetCallbackConvClientImpl.java | 180 ---- .../CallBackSetCallbackConvNonSerCallback.java | 58 - .../CallBackSetCallbackConvObjectCallback.java | 54 - .../sca/test/CallBackSetCallbackConvService.java | 36 - .../test/CallBackSetCallbackConvServiceImpl.java | 98 -- .../CallBackSetCallbackConvTest.composite | 33 - .../sca/test/CallBackSetCallbackConvTestCase.java | 48 - .../sca-java-1.0.1/itest/component-type/DISCLAIMER | 8 - .../sca-java-1.0.1/itest/component-type/LICENSE | 205 ---- .../sca-java-1.0.1/itest/component-type/NOTICE | 6 - .../sca-java-1.0.1/itest/component-type/pom.xml | 46 - .../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 | 67 -- .../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 - .../export-composite/DISCLAIMER | 8 - .../export-composite/LICENSE | 205 ---- .../export-composite/NOTICE | 6 - .../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 | 80 -- .../export-java/DISCLAIMER | 8 - .../contribution-import-export/export-java/LICENSE | 205 ---- .../contribution-import-export/export-java/NOTICE | 6 - .../contribution-import-export/export-java/pom.xml | 67 -- .../main/java/helloworld/HelloWorldService.java | 30 - .../main/resources/META-INF/sca-contribution.xml | 24 - .../export-wsdl/DISCLAIMER | 8 - .../contribution-import-export/export-wsdl/LICENSE | 205 ---- .../contribution-import-export/export-wsdl/NOTICE | 6 - .../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/DISCLAIMER | 8 - .../import-composite/LICENSE | 205 ---- .../import-composite/NOTICE | 6 - .../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 | 111 -- .../import-java/DISCLAIMER | 8 - .../contribution-import-export/import-java/LICENSE | 205 ---- .../contribution-import-export/import-java/NOTICE | 6 - .../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 | 32 - .../contribution/HelloWorldServerTestCase.java | 110 -- .../import-wsdl/DISCLAIMER | 8 - .../contribution-import-export/import-wsdl/LICENSE | 205 ---- .../contribution-import-export/import-wsdl/NOTICE | 6 - .../contribution-import-export/import-wsdl/pom.xml | 67 -- .../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 | 109 -- .../itest/contribution-import-export/pom.xml | 54 - .../itest/contribution-multiple/DISCLAIMER | 8 - .../itest/contribution-multiple/LICENSE | 205 ---- .../itest/contribution-multiple/NOTICE | 6 - .../itest/contribution-multiple/pom.xml | 51 - .../src/test/java/hello/Hello.java | 29 - .../src/test/java/hello/HelloImpl.java | 33 - .../src/test/java/helloworld/HelloWorldImpl.java | 38 - .../test/java/helloworld/HelloWorldService.java | 29 - .../src/test/java/test/ContributionTestCase.java | 116 -- .../META-INF/sca-contribution.xml | 25 - .../resources/contribution-export/hello.composite | 31 - .../META-INF/sca-contribution.xml | 26 - .../helloworld_one.composite | 35 - .../sca-java-1.0.1/itest/contribution/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/contribution/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/contribution/NOTICE | 6 - branches/sca-java-1.0.1/itest/contribution/pom.xml | 45 - .../src/main/java/calculator/AddService.java | 25 - .../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 | 25 - .../main/java/calculator/DivideServiceImpl.java | 30 - .../src/main/java/calculator/MultiplyService.java | 25 - .../main/java/calculator/MultiplyServiceImpl.java | 30 - .../src/main/java/calculator/SubtractService.java | 25 - .../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 | 175 --- .../resources/deployables/sample-calculator.jar | Bin 26901 -> 0 bytes .../resources/repository/sample-calculator.jar | Bin 26901 -> 0 bytes .../itest/conversations-ws/DISCLAIMER | 8 - .../sca-java-1.0.1/itest/conversations-ws/LICENSE | 205 ---- .../sca-java-1.0.1/itest/conversations-ws/NOTICE | 6 - .../sca-java-1.0.1/itest/conversations-ws/pom.xml | 58 - .../conversational/ConversationIdService.java | 29 - .../conversational/ConversationalCallback.java | 50 - .../itest/conversational/ConversationalClient.java | 51 - .../ConversationalReferenceClient.java | 36 - .../conversational/ConversationalService.java | 62 -- ...ersationalServiceNonConversationalCallback.java | 62 -- .../conversational/NonConversationalCallback.java | 48 - .../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 | 122 --- .../ConversationalServiceStatelessScopeImpl.java | 93 -- .../src/main/resources/ConversationAge.composite | 31 - .../src/main/resources/conversationId.composite | 27 - .../src/main/resources/conversational.composite | 101 -- .../conversational/ConversationIdTestCase.java | 54 - .../conversational/ConversationalAgeTestCase.java | 103 -- .../conversational/ConversationalJ2SETestCase.java | 84 -- .../conversational/ConversationalTestCase.java | 585 ---------- .../sca-java-1.0.1/itest/conversations/DISCLAIMER | 8 - .../sca-java-1.0.1/itest/conversations/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/conversations/NOTICE | 6 - .../sca-java-1.0.1/itest/conversations/pom.xml | 45 - .../conversational/ConversationIdService.java | 29 - .../conversational/ConversationalCallback.java | 50 - .../itest/conversational/ConversationalClient.java | 51 - .../ConversationalReferenceClient.java | 36 - .../conversational/ConversationalService.java | 62 -- ...ersationalServiceNonConversationalCallback.java | 62 -- .../conversational/NonConversationalCallback.java | 48 - .../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 | 122 --- .../ConversationalServiceStatelessScopeImpl.java | 93 -- .../src/main/resources/ConversationAge.composite | 31 - .../src/main/resources/conversationId.composite | 27 - .../src/main/resources/conversational.composite | 90 -- .../conversational/ConversationIdTestCase.java | 54 - .../conversational/ConversationalAgeTestCase.java | 103 -- .../conversational/ConversationalJ2SETestCase.java | 84 -- .../conversational/ConversationalTestCase.java | 580 ---------- .../itest/databindings/common/DISCLAIMER | 8 - .../itest/databindings/common/LICENSE | 205 ---- .../itest/databindings/common/NOTICE | 6 - .../itest/databindings/common/pom.xml | 120 --- .../tuscany/sca/itest/generate/Generate.java | 123 --- .../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 - .../sca-java-1.0.1/itest/databindings/config.png | Bin 31222 -> 0 bytes .../sca-java-1.0.1/itest/databindings/config.svg | 117 -- .../itest/databindings/databinding.png | Bin 14106 -> 0 bytes .../itest/databindings/databinding.svg | 242 ----- .../sca-java-1.0.1/itest/databindings/interop.png | Bin 23179 -> 0 bytes .../sca-java-1.0.1/itest/databindings/interop.svg | 352 ------ .../itest/databindings/interop/DISCLAIMER | 8 - .../itest/databindings/interop/LICENSE | 205 ---- .../itest/databindings/interop/NOTICE | 6 - .../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/jaxbgen/DISCLAIMER | 8 - .../itest/databindings/jaxbgen/LICENSE | 205 ---- .../itest/databindings/jaxbgen/NOTICE | 6 - .../itest/databindings/jaxbgen/pom.xml | 251 ----- .../src/main/resources/generate/generate.xml | 172 --- .../jaxbgen/src/main/resources/greeter.composite | 49 - branches/sca-java-1.0.1/itest/databindings/pom.xml | 45 - .../sca-java-1.0.1/itest/databindings/readme.html | 157 --- .../itest/databindings/sdogen/DISCLAIMER | 8 - .../itest/databindings/sdogen/LICENSE | 205 ---- .../itest/databindings/sdogen/NOTICE | 6 - .../itest/databindings/sdogen/pom.xml | 225 ---- .../src/main/resources/generate/generate.xml | 173 --- .../main/resources/generate/greeter.composite.vm | 56 - .../sdogen/src/main/resources/generate/pom.xml.vm | 223 ---- .../itest/exceptions-cross-binding-ws/DISCLAIMER | 8 - .../itest/exceptions-cross-binding-ws/LICENSE | 205 ---- .../itest/exceptions-cross-binding-ws/NOTICE | 6 - .../itest/exceptions-cross-binding-ws/pom.xml | 222 ---- .../exceptions/impl/StockExceptionTestJAXB.java | 31 - .../test/exceptions/impl/StockExchangeJaxB.java | 76 -- .../sca/test/exceptions/impl/StockTraderSDO.java | 37 - .../test/exceptions/impl/StockTraderSDOImpl.java | 122 --- .../sdohandgen/InvalidSymbolSDOException.java | 85 -- .../sdohandgen/MarketClosedSDOException.java | 78 -- .../exceptions/sdohandgen/StockExceptionTest.java | 46 - .../src/main/resources/ExceptionTest.composite | 23 - .../src/main/resources/intracomposite.composite | 44 - .../resources/wsdl.sdo/StockExceptionTest.wsdl | 141 --- .../main/resources/wsdl/StockExceptionTest.wsdl | 148 --- .../src/main/resources/xsd/StockExceptionTest.xsd | 65 -- .../exceptions/IntraCompositeTestCaseFIXME.java | 92 -- .../itest/exceptions-cross-binding/DISCLAIMER | 8 - .../itest/exceptions-cross-binding/LICENSE | 205 ---- .../itest/exceptions-cross-binding/NOTICE | 6 - .../itest/exceptions-cross-binding/pom.xml | 216 ---- .../exceptions/impl/StockExceptionTestJAXB.java | 31 - .../test/exceptions/impl/StockExchangeJaxB.java | 76 -- .../sca/test/exceptions/impl/StockTraderSDO.java | 37 - .../test/exceptions/impl/StockTraderSDOImpl.java | 122 --- .../sdohandgen/InvalidSymbolSDOException.java | 85 -- .../sdohandgen/MarketClosedSDOException.java | 78 -- .../exceptions/sdohandgen/StockExceptionTest.java | 46 - .../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 -- .../itest/exceptions-simple-ws/DISCLAIMER | 8 - .../itest/exceptions-simple-ws/LICENSE | 205 ---- .../itest/exceptions-simple-ws/NOTICE | 6 - .../itest/exceptions-simple-ws/pom.xml | 59 -- .../main/java/com/example/BusinessException.java | 41 - .../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 | 40 - .../src/main/resources/wsdl/ExampleService.wsdl | 129 --- .../src/test/java/com/example/ExampleTestCase.java | 44 - .../sca-java-1.0.1/itest/exceptions/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/exceptions/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/exceptions/NOTICE | 6 - branches/sca-java-1.0.1/itest/exceptions/pom.xml | 45 - .../tuscany/sca/test/exceptions/Checked.java | 58 - .../sca/test/exceptions/ExceptionHandler.java | 32 - .../sca/test/exceptions/ExceptionThrower.java | 31 - .../tuscany/sca/test/exceptions/UnChecked.java | 57 - .../test/exceptions/impl/ExceptionHandlerImpl.java | 120 --- .../test/exceptions/impl/ExceptionThrowerImpl.java | 48 - .../src/main/resources/ExceptionTest.composite | 27 - .../src/main/resources/intracomposite.composite | 34 - .../test/exceptions/IntraCompositeTestCase.java | 51 - .../sca-java-1.0.1/itest/extended-api/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/extended-api/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/extended-api/NOTICE | 6 - branches/sca-java-1.0.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 -- .../sca-java-1.0.1/itest/interfaces/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/interfaces/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/interfaces/NOTICE | 6 - branches/sca-java-1.0.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 | 39 - .../interfaces/LocalServiceComponentImpl.java | 49 - .../sca/itest/interfaces/ParameterObject.java | 47 - .../itest/interfaces/RemoteCallbackInterface.java | 33 - .../itest/interfaces/RemoteClientComponent.java | 62 -- .../interfaces/RemoteClientComponentImpl.java | 74 -- .../itest/interfaces/RemoteServiceComponent.java | 36 - .../interfaces/RemoteServiceComponentImpl.java | 50 - .../src/main/resources/InterfacesTest.composite | 40 - .../sca/itest/interfaces/InterfacesTestCase.java | 121 --- .../itest/interop-soap-client/DISCLAIMER | 8 - .../itest/interop-soap-client/LICENSE | 205 ---- .../itest/interop-soap-client/NOTICE | 6 - .../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 --- .../itest/interop-soap-round2-client/DISCLAIMER | 8 - .../itest/interop-soap-round2-client/LICENSE | 205 ---- .../itest/interop-soap-round2-client/NOTICE | 6 - .../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 --- .../itest/interop-soap-service/DISCLAIMER | 8 - .../itest/interop-soap-service/LICENSE | 205 ---- .../itest/interop-soap-service/NOTICE | 6 - .../itest/interop-soap-service/pom.xml | 137 --- .../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 - .../itest/interop-soap-service/t.bat | 34 - .../sca-java-1.0.1/itest/large-sdo-ws/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/large-sdo-ws/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/large-sdo-ws/NOTICE | 6 - branches/sca-java-1.0.1/itest/large-sdo-ws/pom.xml | 130 --- .../tuscany/sca/itest/trninq/TrnInqClient.java | 43 - .../tuscany/sca/itest/trninq/TrnInqService.java | 112 -- .../tuscany/sca/itest/trninq/TrninqInterface.java | 38 - .../src/main/resources/trnInq.composite | 39 - .../src/main/resources/wsdl/IFX170_XSD.xsd | 146 --- .../src/main/resources/wsdl/trninq.wsdl | 57 - .../test/java/trninq/TrnInqServiceTestCase.java | 85 -- branches/sca-java-1.0.1/itest/oneway/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/oneway/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/oneway/NOTICE | 6 - branches/sca-java-1.0.1/itest/oneway/build.xml | 127 --- branches/sca-java-1.0.1/itest/oneway/pom.xml | 57 - .../tuscany/sca/itest/oneway/OneWayClient.java | 32 - .../tuscany/sca/itest/oneway/OneWayService.java | 37 - .../sca/itest/oneway/impl/OneWayClientImpl.java | 52 - .../sca/itest/oneway/impl/OneWayServer.java | 46 - .../sca/itest/oneway/impl/OneWayServiceImpl.java | 45 - .../oneway/src/main/resources/oneWay.composite | 39 - .../src/main/resources/oneWayClient.composite | 31 - .../tuscany/sca/itest/oneway/OneWayClientTest.java | 66 -- .../tuscany/sca/itest/oneway/OneWayTestCase.java | 70 -- .../itest/operation-overloading/DISCLAIMER | 8 - .../itest/operation-overloading/LICENSE | 205 ---- .../itest/operation-overloading/NOTICE | 6 - .../itest/operation-overloading/pom.xml | 45 - .../sca/test/opoverload/OverloadASourceTarget.java | 42 - .../sca/test/opoverload/impl/OverloadASource.java | 104 -- .../sca/test/opoverload/impl/OverloadATarget.java | 96 -- .../src/main/resources/OperationOverload.composite | 34 - .../test/opoverload/impl/OverloadATestCase.java | 72 -- .../contribution-classes-v2/DISCLAIMER | 8 - .../contribution-classes-v2/LICENSE | 205 ---- .../contribution-classes-v2/NOTICE | 6 - .../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/DISCLAIMER | 8 - .../osgi-contribution/contribution-classes/LICENSE | 205 ---- .../osgi-contribution/contribution-classes/NOTICE | 6 - .../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/DISCLAIMER | 8 - .../osgi-contribution/contribution-test/LICENSE | 205 ---- .../osgi-contribution/contribution-test/NOTICE | 6 - .../osgi-contribution/contribution-test/pom.xml | 104 -- .../sca/contribution/osgi/OSGiTestUtil.java | 73 -- .../src/main/resources/META-INF/LICENSE.txt | 202 ---- .../src/main/resources/META-INF/NOTICE | 14 - .../src/main/resources/META-INF/README.txt | 35 - .../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 - .../sca-java-1.0.1/itest/osgi-contribution/pom.xml | 52 - .../itest/osgi-implementation/DISCLAIMER | 8 - .../itest/osgi-implementation/LICENSE | 205 ---- .../itest/osgi-implementation/NOTICE | 6 - .../itest/osgi-implementation/build-bundles.xml | 34 - .../itest/osgi-implementation/pom.xml | 1115 -------------------- .../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 | 124 --- .../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 -- .../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 | 104 -- .../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 - .../src/main/resources/META-INF/LICENSE.txt | 202 ---- .../src/main/resources/META-INF/NOTICE | 14 - .../src/main/resources/META-INF/README.txt | 35 - .../main/resources/META-INF/sca-contribution.xml | 24 - .../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 - .../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 - .../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 --- .../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 | 52 - .../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 | 44 - branches/sca-java-1.0.1/itest/pom.xml | 102 -- .../sca-java-1.0.1/itest/properties/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/properties/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/properties/NOTICE | 6 - branches/sca-java-1.0.1/itest/properties/pom.xml | 84 -- .../java/mysca/test/myservice/impl/MyService.java | 26 - .../mysca/test/myservice/impl/MyServiceImpl.java | 73 -- .../test/myservice/impl/MyTotalServiceImpl.java | 39 - .../apache/tuscany/sca/itest/ABCDComponent.java | 27 - .../tuscany/sca/itest/ABCDComponentImpl.java | 55 - .../org/apache/tuscany/sca/itest/ABComponent.java | 35 - .../apache/tuscany/sca/itest/ABComponentImpl.java | 98 -- .../org/apache/tuscany/sca/itest/CDComponent.java | 33 - .../apache/tuscany/sca/itest/CDComponentImpl.java | 97 -- .../tuscany/sca/itest/ComplexPropertyBean.java | 89 -- .../apache/tuscany/sca/itest/OverrideService.java | 25 - .../tuscany/sca/itest/OverrideServiceImpl.java | 24 - .../tuscany/sca/itest/PropertyComponent.java | 62 -- .../tuscany/sca/itest/PropertyComponentImpl.java | 152 --- .../apache/tuscany/sca/itest/PropertyService.java | 24 - .../properties/src/main/resources/Outer.composite | 43 - .../src/main/resources/OuterPropertyTest.composite | 42 - .../src/main/resources/PropertyTest.composite | 237 ----- .../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 - .../tuscany/sca/itest/MyTotalServiceTestCase.java | 70 -- .../tuscany/sca/itest/OuterPropertyTestCase.java | 92 -- .../apache/tuscany/sca/itest/PropertyTestCase.java | 266 ----- branches/sca-java-1.0.1/itest/recursive/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/recursive/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/recursive/NOTICE | 6 - branches/sca-java-1.0.1/itest/recursive/pom.xml | 45 - .../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 | 55 - .../recursive/src/main/java/composite/Target.java | 30 - .../src/main/java/composite/TargetImpl.java | 41 - .../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/Composite1.composite | 42 - .../src/main/resources/Composite2.composite | 43 - .../src/main/resources/Composite3.composite | 48 - .../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 - .../main/resources/test1/InnerComposite.composite | 39 - .../main/resources/test1/OuterComposite.composite | 27 - .../src/test/java/composite/CompositeTestCase.java | 51 - .../LocateServiceEmbeddedSCADomainTestCase.java | 113 -- .../composite/LocateServiceSCADomainTestCase.java | 73 -- .../sample/RecursiveCompositeTestCaseFIXME.java | 53 - .../src/test/java/test/InnerTestCase.java | 51 - .../src/test/java/test/OuterTestCase.java | 51 - .../test1/composite/CompositeClientTestCase.java | 38 - .../sca-java-1.0.1/itest/references/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/references/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/references/NOTICE | 6 - branches/sca-java-1.0.1/itest/references/pom.xml | 46 - .../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 - .../tuscany/sca/itest/references/CComponent.java | 24 - .../sca/itest/references/CComponentImpl.java | 27 - .../tuscany/sca/itest/references/DComponent.java | 25 - .../sca/itest/references/DComponentImpl.java | 35 - .../resources/AutoWiredReferencesTest.composite | 56 - .../main/resources/InnerReferencesTest.composite | 54 - .../references/AutoWiredReferenceTestCase.java | 92 -- .../itest/references/InnerReferenceTestCase.java | 98 -- branches/sca-java-1.0.1/itest/scopes/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/scopes/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/scopes/NOTICE | 6 - branches/sca-java-1.0.1/itest/scopes/pom.xml | 47 - .../scopes/CompositeScopeStateVerifierImpl.java | 44 - .../scopes/RequestScopeStateVerifierImpl.java | 37 - .../tuscany/sca/itest/scopes/StateVerifier.java | 25 - .../scopes/src/main/resources/scopes.composite | 33 - .../org/apache/tuscany/sca/test/ScopeTestCase.java | 93 -- branches/sca-java-1.0.1/itest/services/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/services/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/services/NOTICE | 6 - branches/sca-java-1.0.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 - .../src/main/resources/ServicesTest.composite | 70 -- .../sca/itest/services/ServicesTestCase.java | 103 -- branches/sca-java-1.0.1/itest/wires/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/wires/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/wires/NOTICE | 6 - branches/sca-java-1.0.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 | 34 - .../org/apache/tuscany/sca/itest/WireTestCase.java | 66 -- .../itest/ws-void-args-return/DISCLAIMER | 8 - .../itest/ws-void-args-return/LICENSE | 205 ---- .../itest/ws-void-args-return/NOTICE | 6 - .../itest/ws-void-args-return/pom.xml | 61 -- .../src/main/java/voidtest/HelloWorldImpl.java | 49 - .../src/main/java/voidtest/HelloWorldService.java | 41 - .../src/main/java/voidtest/TestClient.java | 23 - .../src/main/java/voidtest/TestClientImpl.java | 45 - .../src/main/resources/voidtest.composite | 41 - .../test/java/voidtest/VoidArgsReturnTestCase.java | 53 - branches/sca-java-1.0.1/itest/wsdl/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/wsdl/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/wsdl/NOTICE | 6 - branches/sca-java-1.0.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 - .../wsdl/src/main/resources/SDOWSDLTest.composite | 344 ------ .../wsdl/src/main/resources/WSDLTest.composite | 371 ------- .../src/main/resources/wsdl/AccountService.wsdl | 453 -------- .../wsdl/src/main/resources/wsdl/helloworld.wsdl | 80 -- .../apache/tuscany/sca/itest/SDOWSDLTestCase.java | 169 --- .../org/apache/tuscany/sca/itest/WSDLTestCase.java | 146 --- branches/sca-java-1.0.1/itest/wsdl2java/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/wsdl2java/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/wsdl2java/NOTICE | 6 - branches/sca-java-1.0.1/itest/wsdl2java/pom.xml | 188 ---- .../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 --- branches/sca-java-1.0.1/itest/wsdlless/DISCLAIMER | 8 - branches/sca-java-1.0.1/itest/wsdlless/LICENSE | 205 ---- branches/sca-java-1.0.1/itest/wsdlless/NOTICE | 6 - branches/sca-java-1.0.1/itest/wsdlless/pom.xml | 135 --- .../services/accountdata/AccountDataService.java | 91 -- .../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 | 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 - .../src/main/resources/SDOWSDLTest.composite | 321 ------ .../wsdlless/src/main/resources/WSDLTest.composite | 350 ------ .../src/main/resources/wsdl/AccountService.wsdl | 453 -------- .../src/main/resources/wsdl/helloworld.wsdl | 80 -- .../apache/tuscany/sca/itest/SDOWSDLTestCase.java | 169 --- .../org/apache/tuscany/sca/itest/WSDLTestCase.java | 146 --- 1264 files changed, 73623 deletions(-) delete mode 100644 branches/sca-java-1.0.1/itest/admin/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/admin/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/admin/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/admin/README delete mode 100644 branches/sca-java-1.0.1/itest/admin/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration1Composite.composite delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration3Composite.composite delete mode 100644 branches/sca-java-1.0.1/itest/admin/src/test/resources/MySimpleService.composite delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/src/main/resources/CallBackApiTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType delete mode 100644 branches/sca-java-1.0.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/src/main/resources/CallBackIdClient.composite delete mode 100644 branches/sca-java-1.0.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/component-type/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/component-type/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/component-type/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/AddService.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorClient.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorService.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/DivideService.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/MultiplyService.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/SubtractService.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/resources/Calculator.composite delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType delete mode 100644 branches/sca-java-1.0.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-java/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-java/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-java/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-java/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-java/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-java/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-java/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-java/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-import-export/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/hello/Hello.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite delete mode 100644 branches/sca-java-1.0.1/itest/contribution/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/contribution/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/contribution/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/contribution/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/AddService.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/CalculatorClient.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/CalculatorService.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/DivideService.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/MultiplyService.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/SubtractService.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/resources/ContributionTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/resources/calculator/Calculator.composite delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar delete mode 100644 branches/sca-java-1.0.1/itest/contribution/src/test/resources/repository/sample-calculator.jar delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/ConversationAge.composite delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/conversationId.composite delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/conversational.composite delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/conversations/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/conversations/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/conversations/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/resources/ConversationAge.composite delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/resources/conversationId.composite delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/main/resources/conversational.composite delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/generate.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Import.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Import.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Include.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Include.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Notation.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Person.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd delete mode 100644 branches/sca-java-1.0.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/databindings/config.png delete mode 100644 branches/sca-java-1.0.1/itest/databindings/config.svg delete mode 100644 branches/sca-java-1.0.1/itest/databindings/databinding.png delete mode 100644 branches/sca-java-1.0.1/itest/databindings/databinding.svg delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop.png delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop.svg delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/generate.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/jaxbgen/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/databindings/jaxbgen/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/databindings/jaxbgen/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/databindings/jaxbgen/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite delete mode 100644 branches/sca-java-1.0.1/itest/databindings/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/readme.html delete mode 100644 branches/sca-java-1.0.1/itest/databindings/sdogen/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/databindings/sdogen/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/databindings/sdogen/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/databindings/sdogen/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/sdogen/src/main/resources/generate/generate.xml delete mode 100644 branches/sca-java-1.0.1/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm delete mode 100644 branches/sca-java-1.0.1/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/resources/example.composite delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/src/main/resources/ExceptionTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/src/main/resources/intracomposite.composite delete mode 100644 branches/sca-java-1.0.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/src/main/resources/BasicService.composite delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/src/main/resources/MathService.composite delete mode 100644 branches/sca-java-1.0.1/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/main/resources/InterfacesTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-client/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-client/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-client/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-client/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-client/src/main/resources/default.composite delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-round2-client/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-round2-client/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-round2-client/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-round2-client/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-round2-client/src/main/resources/default.composite delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-service/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-service/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-service/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-service/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl delete mode 100644 branches/sca-java-1.0.1/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml delete mode 100755 branches/sca-java-1.0.1/itest/interop-soap-service/t.bat delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/src/main/resources/trnInq.composite delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/oneway/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/oneway/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/oneway/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/oneway/build.xml delete mode 100644 branches/sca-java-1.0.1/itest/oneway/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java delete mode 100644 branches/sca-java-1.0.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java delete mode 100644 branches/sca-java-1.0.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServer.java delete mode 100644 branches/sca-java-1.0.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/oneway/src/main/resources/oneWay.composite delete mode 100644 branches/sca-java-1.0.1/itest/oneway/src/main/resources/oneWayClient.composite delete mode 100644 branches/sca-java-1.0.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayClientTest.java delete mode 100644 branches/sca-java-1.0.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/operation-overloading/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/operation-overloading/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/operation-overloading/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/operation-overloading/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java delete mode 100644 branches/sca-java-1.0.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java delete mode 100644 branches/sca-java-1.0.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java delete mode 100644 branches/sca-java-1.0.1/itest/operation-overloading/src/main/resources/OperationOverload.composite delete mode 100644 branches/sca-java-1.0.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/build-bundles.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/src/main/resources/META-INF/LICENSE.txt delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/src/main/resources/META-INF/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/src/main/resources/META-INF/README.txt delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties delete mode 100644 branches/sca-java-1.0.1/itest/osgi-contribution/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/build-bundles.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/Greetings.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/LICENSE.txt delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/README.txt delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/factory/factory-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/services/services-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Customer1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Customer2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/version/version-test.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java delete mode 100644 branches/sca-java-1.0.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties delete mode 100644 branches/sca-java-1.0.1/itest/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/properties/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/properties/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/properties/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/properties/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/resources/Outer.composite delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/resources/OuterPropertyTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/resources/PropertyTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/resources/customer.xsd delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/resources/fileProperty.txt delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/resources/manyValuesFileProperty.txt delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/main/resources/mySimpleService.composite delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/recursive/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/recursive/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/recursive/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/CompositeClient.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/Source.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/SourceCallback.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/SourceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/Target.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/composite/TargetImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentAImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentCImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentEImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/ComponentFImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/sample/Service1.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/test/Aggregator.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/test/AggregatorImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/test/InnerSourceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/test/OuterSourceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/test/Source.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/Target.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/TargetOne.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/java/test1/composite/TargetTwo.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite1.composite delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite2.composite delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/Composite3.composite delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/Inner.composite delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/InnerComposite.composite delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/InnerComposite2.composite delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/Outer.composite delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/OuterComposite.composite delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/test1/InnerComposite.composite delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/main/resources/test1/OuterComposite.composite delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/CompositeTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/test/java/test/InnerTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/test/java/test/OuterTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/references/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/references/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/references/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/references/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/references/src/main/resources/InnerReferencesTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/scopes/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/scopes/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/scopes/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/scopes/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java delete mode 100644 branches/sca-java-1.0.1/itest/scopes/src/main/resources/scopes.composite delete mode 100644 branches/sca-java-1.0.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/services/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/services/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/services/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/services/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java delete mode 100644 branches/sca-java-1.0.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/services/src/main/resources/ServicesTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/wires/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/wires/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/wires/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/wires/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java delete mode 100644 branches/sca-java-1.0.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java delete mode 100644 branches/sca-java-1.0.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wires/src/main/resources/WireTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/ws-void-args-return/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/ws-void-args-return/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/ws-void-args-return/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/ws-void-args-return/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java delete mode 100644 branches/sca-java-1.0.1/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java delete mode 100644 branches/sca-java-1.0.1/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/ws-void-args-return/src/main/resources/voidtest.composite delete mode 100644 branches/sca-java-1.0.1/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/helloworld/HelloWorldService.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/resources/SDOWSDLTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/resources/WSDLTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdl2java/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/wsdl2java/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/wsdl2java/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/wsdl2java/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/wsdl2java/src/test/resources/AccountService.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/wsdl2java/src/test/resources/EchoService.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/wsdl2java/src/test/resources/EchoService.xsd delete mode 100644 branches/sca-java-1.0.1/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/DISCLAIMER delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/LICENSE delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/NOTICE delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/pom.xml delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/resources/SDOWSDLTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/resources/WSDLTest.composite delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java delete mode 100644 branches/sca-java-1.0.1/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java (limited to 'branches/sca-java-1.0.1/itest') diff --git a/branches/sca-java-1.0.1/itest/admin/DISCLAIMER b/branches/sca-java-1.0.1/itest/admin/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/admin/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/admin/LICENSE b/branches/sca-java-1.0.1/itest/admin/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/admin/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/admin/NOTICE b/branches/sca-java-1.0.1/itest/admin/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/admin/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/admin/README b/branches/sca-java-1.0.1/itest/admin/README deleted file mode 100644 index c4e96d7af0..0000000000 --- a/branches/sca-java-1.0.1/itest/admin/README +++ /dev/null @@ -1,28 +0,0 @@ -This is a simple test compiled to test simple features of SCA - -There are interfaces to different services that have been included - -1. MyListService -2. MyListServiceByYear -3. MyService -4. MyServiceByDate -5. MyTotalservice - -The service that has been used in the tests primarily is MyService/MyTotalService. -in the test cases. - -There are three test cases and three composites (MySimppleService,Iteration1,Iteration3). - -1. MySimpleServiceTestCase - Checks if the components in MySimpleService.composite are initialized properly. - It tries to call simple functions implemented in MySimpleServiceImpl. - -2. MyTotalServiceTestCase - Initializes the components in the Iteration3Composite.composite file. - tries to call simple functions implemented in MyTotalServiceImpl. - -3. MySimpleServiceInRecursiveTestCase - Initializes the components in the Iteration1Composite.composite file. - It initializes its components using implementation:composite tag in the - composite file which points to MySimpleService.composite. - The test case recursively calls functions initialized in MySimpleService.composite. - - - diff --git a/branches/sca-java-1.0.1/itest/admin/pom.xml b/branches/sca-java-1.0.1/itest/admin/pom.xml deleted file mode 100644 index 7d1a294006..0000000000 --- a/branches/sca-java-1.0.1/itest/admin/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - tuscany-itest-admin - Apache Tuscany Admin Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-core-databinding - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-databinding-sdo - 1.0.1-incubating-SNAPSHOT - compile - - - - diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java deleted file mode 100644 index af9234b9bc..0000000000 --- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.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.admin; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface MyListService { - String[] getHolidays(); - String getYear(); -} diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java deleted file mode 100644 index 4197007519..0000000000 --- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.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.admin; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface MyListServiceByYear { - String[] getHolidays(int year); -} diff --git a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java deleted file mode 100644 index 21b38e734a..0000000000 --- a/branches/sca-java-1.0.1/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * 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.admin; - - -import java.util.List; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -import org.apache.tuscany.sca.itest.admin.MyListService; -import org.apache.tuscany.sca.itest.admin.MyListServiceByYear; - -@Service(interfaces={MyListService.class,MyListServiceByYear.class}) - -public class MyListServiceImpl implements MyListService,MyListServiceByYear -{ - - // This is multiplicity=1:n - @Reference(name="myListServiceList",required=true) - public List myListServicesList; - - // This is multiplicity=0:n - @Reference(name="myListServiceArray",required=false) - public MyListService[] myListServicesArray; - - @Property(name="serviceYear") - protected String year = "2006"; - - public String[] getHolidays() - { - return getHolidays(new Integer(year).intValue()); - } - - public String[] getHolidays(int year) - { - MyListService myService; - if (myListServicesList!=null) - { - for (int i=0; i=0 && index - - - - Raleigh - 2008 - - Durham - 2009 - - - - - - - - Durham - 2009 - - - diff --git a/branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration3Composite.composite b/branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration3Composite.composite deleted file mode 100644 index dd06d030d6..0000000000 --- a/branches/sca-java-1.0.1/itest/admin/src/test/resources/Iteration3Composite.composite +++ /dev/null @@ -1,68 +0,0 @@ - - - - - Raleigh - 2008 - - - - - - - - CARY - 2007 - - - - - - - - - - - - - - - - - - - - - Durham - 2009 - - - - - - - - Durham - 2009 - - diff --git a/branches/sca-java-1.0.1/itest/admin/src/test/resources/MySimpleService.composite b/branches/sca-java-1.0.1/itest/admin/src/test/resources/MySimpleService.composite deleted file mode 100644 index a1f8abb8da..0000000000 --- a/branches/sca-java-1.0.1/itest/admin/src/test/resources/MySimpleService.composite +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - Raleigh - 2008 - - - - - - - - CARY - 2007 - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/callablereferences/DISCLAIMER b/branches/sca-java-1.0.1/itest/callablereferences/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/callablereferences/LICENSE b/branches/sca-java-1.0.1/itest/callablereferences/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/callablereferences/NOTICE b/branches/sca-java-1.0.1/itest/callablereferences/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/callablereferences/pom.xml b/branches/sca-java-1.0.1/itest/callablereferences/pom.xml deleted file mode 100644 index 4f6b98c130..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-callablereferences - Apache Tuscany SCA Callable References Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-node-impl - 1.0.1-incubating-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-domain-impl - 1.0.1-incubating-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.0.1-incubating-SNAPSHOT - test - - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.0.1-incubating-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-binding-sca-axis2 - 1.0.1-incubating-SNAPSHOT - test - - - diff --git a/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java deleted file mode 100644 index fa63d975a6..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.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.callableref; - -public interface AComponent { - String foo(); - - String fooB(); - String fooB1(); - - String fooC(); - String fooC1(); - - String fooD(); - - String fooBC(); - - DComponent getDReference(); -} diff --git a/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java deleted file mode 100644 index af3e624dc7..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * 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.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); - } - - public DComponent getDReference() { - return dReference; - } - -} diff --git a/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java deleted file mode 100644 index ade672b0ab..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java deleted file mode 100644 index 518e77d3a8..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java deleted file mode 100644 index fdf80cc1c8..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java deleted file mode 100644 index cc8ec8f000..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java deleted file mode 100644 index 3b25d351ae..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.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.callableref; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface DComponent { - - String foo(CallableReference aReference); -} diff --git a/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java deleted file mode 100644 index 1ab1973476..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.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.itest.callableref; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -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(); - } - -} diff --git a/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite deleted file mode 100644 index 49b75f56e4..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/CallableReferenceTest.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite deleted file mode 100644 index eb456b99f2..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml deleted file mode 100644 index 95021f72a4..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite deleted file mode 100644 index 2849400be4..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml deleted file mode 100644 index 2edda61601..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java deleted file mode 100644 index bf6bf2ba50..0000000000 --- a/branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.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 org.apache.tuscany.sca.itest.callableref; - - -import static junit.framework.Assert.assertEquals; - -import javax.xml.namespace.QName; - - -import junit.framework.Assert; - - -import org.apache.tuscany.sca.domain.SCADomain; -import org.apache.tuscany.sca.domain.SCADomainFactory; -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 String DEFAULT_DOMAIN_URI = "http://localhost:8877"; - - private static SCADomain domain; - 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 domain"); - SCADomainFactory domainFactory = SCADomainFactory.newInstance(); - domain= domainFactory.createSCADomain(DEFAULT_DOMAIN_URI); - - System.out.println("Setting up nodes"); - - ClassLoader cl = CallableReferenceRemoteTestCase.class.getClassLoader(); - - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - - nodeA = nodeFactory.createSCANode("nodeA", DEFAULT_DOMAIN_URI); - nodeA.addContribution("nodeA", cl.getResource("nodeA/")); - nodeA.start(); - - nodeB = nodeFactory.createSCANode("nodeB", DEFAULT_DOMAIN_URI); - nodeB.addContribution("nodeB", cl.getResource("nodeB/")); - nodeB.start(); - - // get a reference to the calculator service from domainA - // which will be running this component - acomponent = nodeA.getDomain().getService(AComponent.class, "AComponent/AComponent"); - } catch (Exception ex) { - System.out.println(ex.toString()); - } - } - - @AfterClass - public static void destroy() throws Exception { - // stop the nodes and hence the domains they contain - nodeA.stop(); - nodeB.stop(); - } - - @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()); - } - - /* Commented it out as it's still failing - @Test - public void testDReference() { - assertEquals("DAComponent", acomponent.fooD()); - } - */ - - //@Test - public void testBCReference() { - assertEquals("BCComponent", acomponent.fooBC()); - } - - @Test - public void testRequiredFalseReference() { - try { - acomponent.getDReference().foo(null); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - -} diff --git a/branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/branches/sca-java-1.0.1/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java deleted file mode 100644 index 2b7750b443..0000000000 --- a/branches/sca-java-1.0.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.getDReference().foo(null); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - -} diff --git a/branches/sca-java-1.0.1/itest/callback-api/DISCLAIMER b/branches/sca-java-1.0.1/itest/callback-api/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/callback-api/LICENSE b/branches/sca-java-1.0.1/itest/callback-api/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/callback-api/NOTICE b/branches/sca-java-1.0.1/itest/callback-api/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/callback-api/pom.xml b/branches/sca-java-1.0.1/itest/callback-api/pom.xml deleted file mode 100644 index f1a4f54c9d..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-callback-api - Apache Tuscany SCA Callback API Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java deleted file mode 100644 index e03bc1bda8..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.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 CallBackApiCallBack { - - public void callBackMessage(String aString); - - public void callBackIncrement(String aString); - -} diff --git a/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java deleted file mode 100644 index 3e7c840e15..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.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 CallBackApiClient { - - public void run(); - -} diff --git a/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java deleted file mode 100644 index 521464b4a2..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.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.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(); - - 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; - } - - private void test3a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we cant 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()); - - } - - private void test3a1() { - aCallBackService.knockKnockByRef("Knock Knock"); - int count = 0; - - // - // If we cant 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()); - - } - - private void test3b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackApiITest - test3b", 1, 1); - return; - } - - private void test3c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we cant 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; - } - - 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/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java deleted file mode 100644 index 4e15e97c8d..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.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(CallBackApiCallBack.class) -/** - * - */ -public interface CallBackApiService { - - public void knockKnock(String aString); - public void knockKnockByRef(String aString); - public void noCallBack(String aString); - - public void multiCallBack(String aString); - -} diff --git a/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java deleted file mode 100644 index d51904d2ea..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.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; - -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; - - private CallBackApiCallBack callback; - - @Callback - protected CallableReference callbackRef; - - 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; - - } - - 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; - - } - - 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; - - } - - public void noCallBack(String aString) { - - System.out.println("CallBackApiServiceImpl message received: " + aString); - - return; - - } - - 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/branches/sca-java-1.0.1/itest/callback-api/src/main/resources/CallBackApiTest.composite b/branches/sca-java-1.0.1/itest/callback-api/src/main/resources/CallBackApiTest.composite deleted file mode 100644 index 946c4862ee..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/src/main/resources/CallBackApiTest.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/branches/sca-java-1.0.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java deleted file mode 100644 index 6d6ca66ab8..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.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 junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackApiTestCase extends TestCase { - - private SCADomain domain; - private CallBackApiClient aCallBackClient; - - public void testCallBackBasic() { - aCallBackClient.run(); - } - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackApiTest.composite"); - - aCallBackClient = domain.getService(CallBackApiClient.class, "CallBackApiClient"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/branches/sca-java-1.0.1/itest/callback-basic/DISCLAIMER b/branches/sca-java-1.0.1/itest/callback-basic/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-basic/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/callback-basic/LICENSE b/branches/sca-java-1.0.1/itest/callback-basic/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-basic/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/callback-basic/NOTICE b/branches/sca-java-1.0.1/itest/callback-basic/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-basic/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/callback-basic/pom.xml b/branches/sca-java-1.0.1/itest/callback-basic/pom.xml deleted file mode 100644 index 502260c542..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-basic/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-callback-basic - Apache Tuscany SCA Callback Basic Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java deleted file mode 100644 index 5e9d3d6821..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java deleted file mode 100644 index 9f4019f28c..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java deleted file mode 100644 index 1bb2dc22b7..0000000000 --- a/branches/sca-java-1.0.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 cant 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 cant 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/branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java deleted file mode 100644 index bd41fa7037..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/branches/sca-java-1.0.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java deleted file mode 100644 index 4ca2dc9af9..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/branches/sca-java-1.0.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite deleted file mode 100644 index c506956088..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/branches/sca-java-1.0.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java deleted file mode 100644 index 177c4bcd18..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.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; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CallBackBasicTestCase extends TestCase { - - private SCADomain domain; - private CallBackBasicClient aCallBackClient; - - public void testCallBackBasic() { - aCallBackClient.run(); - } - - @Override - protected void setUp() throws Exception { - domain = SCADomain.newInstance("CallBackBasicTest.composite"); - aCallBackClient = domain.getService(CallBackBasicClient.class, "CallBackBasicClient"); - } - - @Override - protected void tearDown() throws Exception { - domain.close(); - } - - -} diff --git a/branches/sca-java-1.0.1/itest/callback-complex-type/DISCLAIMER b/branches/sca-java-1.0.1/itest/callback-complex-type/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-complex-type/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/callback-complex-type/LICENSE b/branches/sca-java-1.0.1/itest/callback-complex-type/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-complex-type/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/callback-complex-type/NOTICE b/branches/sca-java-1.0.1/itest/callback-complex-type/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-complex-type/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/callback-complex-type/pom.xml b/branches/sca-java-1.0.1/itest/callback-complex-type/pom.xml deleted file mode 100644 index f546652dfc..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-complex-type/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-callback-complex-type - Apache Tuscany SCA Callback Complex Type Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java deleted file mode 100644 index 9fddb850ba..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java deleted file mode 100644 index 739983c277..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java deleted file mode 100644 index 188b1f2c01..0000000000 --- a/branches/sca-java-1.0.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 cant 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 cant 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/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java deleted file mode 100644 index ffbf4f35fa..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java deleted file mode 100644 index dc31ed156b..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite deleted file mode 100644 index 3f48f16389..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/branches/sca-java-1.0.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType deleted file mode 100644 index ff38134df5..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/branches/sca-java-1.0.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java deleted file mode 100644 index 33d1afaecd..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-id/DISCLAIMER b/branches/sca-java-1.0.1/itest/callback-id/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-id/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/callback-id/LICENSE b/branches/sca-java-1.0.1/itest/callback-id/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-id/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/callback-id/NOTICE b/branches/sca-java-1.0.1/itest/callback-id/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-id/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/callback-id/pom.xml b/branches/sca-java-1.0.1/itest/callback-id/pom.xml deleted file mode 100644 index a6879b11e4..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-id/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-callback-id - Apache Tuscany SCA Callback ID Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java deleted file mode 100644 index b14560a8c3..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java deleted file mode 100644 index a9e551f8b4..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java deleted file mode 100644 index fef0eb50b8..0000000000 --- a/branches/sca-java-1.0.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 cant 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/branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java deleted file mode 100644 index 18c592a1c1..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/branches/sca-java-1.0.1/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java deleted file mode 100644 index 8b0a4b69cf..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-id/src/main/resources/CallBackIdClient.composite b/branches/sca-java-1.0.1/itest/callback-id/src/main/resources/CallBackIdClient.composite deleted file mode 100644 index c9a6ba6258..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-id/src/main/resources/CallBackIdClient.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/branches/sca-java-1.0.1/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java deleted file mode 100644 index 771fbb8ff7..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-multiple-wires/DISCLAIMER b/branches/sca-java-1.0.1/itest/callback-multiple-wires/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-multiple-wires/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/callback-multiple-wires/LICENSE b/branches/sca-java-1.0.1/itest/callback-multiple-wires/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-multiple-wires/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/callback-multiple-wires/NOTICE b/branches/sca-java-1.0.1/itest/callback-multiple-wires/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-multiple-wires/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/callback-multiple-wires/pom.xml b/branches/sca-java-1.0.1/itest/callback-multiple-wires/pom.xml deleted file mode 100644 index 63d3f89fc9..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-multiple-wires/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-callback-multiple-wires - Apache Tuscany SCA Callback With Mutiple Wires Test - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java deleted file mode 100644 index 7c80d222fc..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java deleted file mode 100644 index df91f3d268..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java deleted file mode 100644 index a0a9564002..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java deleted file mode 100644 index cfd601f546..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java deleted file mode 100644 index f198efae51..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java deleted file mode 100644 index 08ab7ca56d..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.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.callback; - -import org.osoa.sca.annotations.Callback; -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 { - - private MyServiceCallback myServiceCallback; - - /** - * The setter used by the runtime to set the callback reference - * @param myServiceCallback - */ - @Callback - public void setMyServiceCallback(MyServiceCallback myServiceCallback) { - this.myServiceCallback = myServiceCallback; - } - - public void someMethod(String arg) { - // invoke the callback - try { - myServiceCallback.receiveResult(arg + " -> receiveResult"); - } catch(RuntimeException e) { - System.out.println("RuntimeException invoking receiveResult: " + e.toString()); - } - } -} diff --git a/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite deleted file mode 100644 index 3dae3ca3a8..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/branches/sca-java-1.0.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java deleted file mode 100644 index 41ba766697..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-callback/DISCLAIMER b/branches/sca-java-1.0.1/itest/callback-set-callback/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-callback/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/callback-set-callback/LICENSE b/branches/sca-java-1.0.1/itest/callback-set-callback/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-callback/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/callback-set-callback/NOTICE b/branches/sca-java-1.0.1/itest/callback-set-callback/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-callback/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/callback-set-callback/pom.xml b/branches/sca-java-1.0.1/itest/callback-set-callback/pom.xml deleted file mode 100644 index e797500ae6..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-callback/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-callback-set-callback - Apache Tuscany SCA Set Callback Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java deleted file mode 100644 index 3b9599f53f..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java deleted file mode 100644 index 48752f2ea1..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java deleted file mode 100644 index ad0e0603a3..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java deleted file mode 100644 index 0a22b0e01f..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java deleted file mode 100644 index 94cb6aa73b..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java deleted file mode 100644 index ee14467de0..0000000000 --- a/branches/sca-java-1.0.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 executon. - */ - - 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 exeception 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/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java deleted file mode 100644 index afedcdf7f1..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java deleted file mode 100644 index 8093093968..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.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.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.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/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite deleted file mode 100644 index 3552ddecab..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/branches/sca-java-1.0.1/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java deleted file mode 100644 index 496ae0b1a5..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-conversation/DISCLAIMER b/branches/sca-java-1.0.1/itest/callback-set-conversation/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-conversation/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/callback-set-conversation/LICENSE b/branches/sca-java-1.0.1/itest/callback-set-conversation/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-conversation/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/callback-set-conversation/NOTICE b/branches/sca-java-1.0.1/itest/callback-set-conversation/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-conversation/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/callback-set-conversation/pom.xml b/branches/sca-java-1.0.1/itest/callback-set-conversation/pom.xml deleted file mode 100644 index 195f698ff7..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-conversation/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-callback-set-conversation - Apache Tuscany SCA Callback Set Conversation Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java deleted file mode 100644 index eb840a006d..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.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 CallBackSetCallbackConvBadCallback { - - 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"); - return; - } - -} diff --git a/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java deleted file mode 100644 index a704fd0ece..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java deleted file mode 100644 index 013424bf5e..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java deleted file mode 100644 index a32322a5f8..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * 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.NoRegisteredCallbackException; -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, - //FIXME: remove the following hack, needed to get around current JavaImplementationInvoker limitation - CallBackSetCallbackConvCallback { - - @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 Serializeable. Verify successful - // execution. - // - - aCallbackObject = new CallBackSetCallbackConvObjectCallback(); - aCallbackObject.incrementCallBackCount(); - - ServiceReference aCallBackServiceRef - = componentContext.cast(aCallBackService); - aCallBackServiceRef.setCallback(aCallbackObject); - //FIXME: remove the following workaround for runtime bug - aCallBackServiceRef.getService().knockKnock("Knock Knock"); - //aCallBackService.knockKnock("Knock Knock"); - - 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()); - //FIXME: remove the following workaround for runtime bug - aCallBackServiceRef.getService().knockKnock("Knock Knock"); - //aCallBackService.knockKnock("Knock Knock"); - } - - // - // 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 Serializeable. Verify - // an appropriate exception - // is thrown. - // - - try { - ServiceReference aCallBackServiceRef - = componentContext.cast(aCallBackService); - aCallBackServiceRef.setCallback(new CallBackSetCallbackConvNonSerCallback()); - //FIXME: remove the following workaround for runtime bug - aCallBackServiceRef.getService().knockKnock("Knock Knock"); - //aCallBackService.knockKnock("Knock Knock"); - } - // - // 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); - - } - - //FIXME: remove the following methods, needed to get around current JavaImplementationInvoker limitation - - public void callBackMessage(String aString) { - throw new IllegalStateException("CallbackSetCallbackConvClientImpl.callbackMessage called"); - } - - public void callBackIncrement(String aString) { - throw new IllegalStateException("CallbackSetCallbackConvClientImpl.callbackIncrement called"); - } - -} diff --git a/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java deleted file mode 100644 index 789e04e907..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.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; - -public class CallBackSetCallbackConvNonSerCallback implements CallBackSetCallbackConvCallback { - - private int callBackCount = 0; - private Object monitor; - - public CallBackSetCallbackConvNonSerCallback() { - super(); - } - - public synchronized void incrementCallBackCount() { - callBackCount++; - } - - public synchronized int getCount() { - return callBackCount; - } - - public void setMonitor(Object anObject) { - monitor = anObject; - } - - public void callBackMessage(String aString) { - - System.out.println("Entering CallBackSetCallbackConvNonSerCallback callBackMessage: " + aString); - - } - - public void callBackIncrement(String aString) { - - System.out.println("Entering callback increment: " + aString); - - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java deleted file mode 100644 index 9b998df045..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.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.test; - - -public class CallBackSetCallbackConvObjectCallback - //FIXME: remove the following hack, needed to get around current JavaImplementationInvoker limitation - extends CallBackSetCallbackConvClientImpl - //implements CallBackSetCallbackConvCallback -{ - 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/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java deleted file mode 100644 index 692b6dfc35..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java deleted file mode 100644 index bca94ce407..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite deleted file mode 100644 index ce73417f94..0000000000 --- a/branches/sca-java-1.0.1/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/branches/sca-java-1.0.1/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java deleted file mode 100644 index 45bdaea9ab..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/DISCLAIMER b/branches/sca-java-1.0.1/itest/component-type/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/component-type/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/component-type/LICENSE b/branches/sca-java-1.0.1/itest/component-type/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/component-type/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/component-type/NOTICE b/branches/sca-java-1.0.1/itest/component-type/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/component-type/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/component-type/pom.xml b/branches/sca-java-1.0.1/itest/component-type/pom.xml deleted file mode 100644 index 818d43c7de..0000000000 --- a/branches/sca-java-1.0.1/itest/component-type/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-component-type - Apache Tuscany SCA Component Type Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - - diff --git a/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/AddService.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/AddService.java deleted file mode 100644 index 188451ebac..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 8b6fe066a6..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 08afd922b3..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorService.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 031fa8b912..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index f14ee506df..0000000000 --- a/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.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 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; - - 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/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/DivideService.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/DivideService.java deleted file mode 100644 index 30d248208b..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index f7ac0b7287..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/MultiplyService.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index b7dca792b2..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/SubtractService.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/SubtractService.java deleted file mode 100644 index bf0d1882b6..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.0.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 77b128ab8d..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/resources/Calculator.composite b/branches/sca-java-1.0.1/itest/component-type/src/main/resources/Calculator.composite deleted file mode 100644 index b229787657..0000000000 --- a/branches/sca-java-1.0.1/itest/component-type/src/main/resources/Calculator.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType deleted file mode 100644 index 00c48e5a35..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType deleted file mode 100644 index 74bedc0a98..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType deleted file mode 100644 index 289fcc3e11..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType deleted file mode 100644 index 2d8a879cda..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/branches/sca-java-1.0.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType deleted file mode 100644 index 6214955141..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/branches/sca-java-1.0.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 08fc8e33bf..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/DISCLAIMER b/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/LICENSE b/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/NOTICE b/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/pom.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/pom.xml deleted file mode 100644 index fb645982dd..0000000000 --- a/branches/sca-java-1.0.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.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-contribution-export-composite - Apache Tuscany SCA Contribution Export Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.0.1-incubating-SNAPSHOT - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java deleted file mode 100644 index e65422136f..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java deleted file mode 100644 index 5369c18497..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 3c14560a56..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite deleted file mode 100644 index 636b7111d9..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java deleted file mode 100644 index e8c4eef771..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * 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.File; -import java.io.IOException; -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.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl; -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(); - - ModelResolver helloResolver = new ModelResolverImpl(cl); - File helloContrib = new File("./target/classes/"); - URL helloURL = helloContrib.toURL(); - Contribution consumerContribution = - contributionService.contribute("http://import-export/hello", helloURL, helloResolver, false); - Composite consumerComposite = consumerContribution.getDeployables().get(0); - domain.getDomainComposite().getIncludes().add(consumerComposite); - domain.getCompositeBuilder().build(consumerComposite); - - // Start Components from my composite - domain.getCompositeActivator().activate(consumerComposite); - domain.getCompositeActivator().start(consumerComposite); - } - - 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/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/DISCLAIMER b/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/LICENSE b/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/NOTICE b/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/pom.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/pom.xml deleted file mode 100644 index 605ddb25b7..0000000000 --- a/branches/sca-java-1.0.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.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-contribution-export-java - Apache Tuscany SCA Contribution Java Export Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.0.1-incubating-SNAPSHOT - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 74d22ed830..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index dc33dfa560..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/DISCLAIMER b/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/LICENSE b/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/NOTICE b/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/pom.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/pom.xml deleted file mode 100644 index 68889bcceb..0000000000 --- a/branches/sca-java-1.0.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.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-contribution-export-wsdl - Apache Tuscany SCA Contribution WSDL Export Integration Tests - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index b7394ec14b..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl deleted file mode 100644 index 9b31363e1a..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/branches/sca-java-1.0.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd deleted file mode 100644 index d3c83b08c6..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/DISCLAIMER b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/LICENSE b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/NOTICE b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/pom.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/pom.xml deleted file mode 100644 index 40ebd709e8..0000000000 --- a/branches/sca-java-1.0.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.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-contribution-import-composite - Apache Tuscany SCA Contribution Import Integration Tests - - - - org.apache.tuscany.sca - itest-contribution-export-composite - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.0.1-incubating-SNAPSHOT - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 966f56d7d5..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java deleted file mode 100644 index 3d43290380..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 74d22ed830..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 9f3f5be452..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl deleted file mode 100644 index 9b31363e1a..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd deleted file mode 100644 index d3c83b08c6..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite deleted file mode 100644 index e2f852ff7e..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index d31b417e24..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.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.test.contribution; - -import helloworld.HelloWorldService; - -import java.io.File; -import java.io.IOException; -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(); - compositeContribution = - contributionService.contribute("http://import-export/export-composite", compositeContribURL, false); - for (Composite deployable : compositeContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.getCompositeBuilder().build(deployable); - } - - File helloWorldContribLocation = new File("./target/classes/"); - URL helloWorldContribURL = helloWorldContribLocation.toURL(); - helloWorldContribution = - contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.getCompositeBuilder().build(deployable); - } - - // Start Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - 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/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/DISCLAIMER b/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/LICENSE b/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/NOTICE b/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/pom.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/pom.xml deleted file mode 100644 index 6ddb5a2ddb..0000000000 --- a/branches/sca-java-1.0.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.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-contribution-import-java - Apache Tuscany SCA Contribution Java Import Java Integration Tests - - - - org.apache.tuscany.sca - itest-contribution-export-java - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.0.1-incubating-SNAPSHOT - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 4cdcc1fd0b..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index e5d14f51d4..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite deleted file mode 100644 index 023b2b6aff..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 432ca868cf..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.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; - -import helloworld.HelloWorldService; - -import java.io.File; -import java.io.IOException; -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(); - javaContribution = contributionService.contribute("http://import-export/export-java", javaContribURL, false); - for (Composite deployable : javaContribution.getDeployables() ) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.getCompositeBuilder().build(deployable); - } - - File helloWorldContribLocation = new File("./target/classes/"); - URL helloWorldContribURL = helloWorldContribLocation.toURL(); - helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : helloWorldContribution.getDeployables() ) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.getCompositeBuilder().build(deployable); - } - - // Start Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables() ) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - 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/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/DISCLAIMER b/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/LICENSE b/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/NOTICE b/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/pom.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/pom.xml deleted file mode 100644 index 826e3bc1fa..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-contribution-import-wsdl - Apache Tuscany SCA Contribution WSDL Import Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.0.1-incubating-SNAPSHOT - runtime - - - - junit - junit - 4.2 - test - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 4cdcc1fd0b..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java deleted file mode 100644 index 3d43290380..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 74d22ed830..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index d46fe0b57c..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite deleted file mode 100644 index 5008a2ea5b..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 9dea44386c..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.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.test.contribution; - -import helloworld.HelloWorldService; - -import java.io.File; -import java.io.IOException; -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(); - wsdlContribution = contributionService.contribute("http://import-export/export-wsdl", wsdlContribURL, false); - for (Composite deployable : wsdlContribution.getDeployables() ) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.getCompositeBuilder().build(deployable); - } - - File helloWorldContribLocation = new File("./target/classes/"); - URL helloWorldContribURL = helloWorldContribLocation.toURL(); - consumerContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : consumerContribution.getDeployables() ) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.getCompositeBuilder().build(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); - } - - 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/branches/sca-java-1.0.1/itest/contribution-import-export/pom.xml b/branches/sca-java-1.0.1/itest/contribution-import-export/pom.xml deleted file mode 100644 index d493eccbb0..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-import-export/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-contribution-import-export - pom - Apache Tuscany SCA Contribution Import/Export Integration Tests - - - export-wsdl - import-wsdl - export-composite - import-composite - export-java - import-java - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.0.1-incubating-SNAPSHOT - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-multiple/DISCLAIMER b/branches/sca-java-1.0.1/itest/contribution-multiple/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-multiple/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/contribution-multiple/LICENSE b/branches/sca-java-1.0.1/itest/contribution-multiple/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-multiple/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-multiple/NOTICE b/branches/sca-java-1.0.1/itest/contribution-multiple/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-multiple/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/contribution-multiple/pom.xml b/branches/sca-java-1.0.1/itest/contribution-multiple/pom.xml deleted file mode 100644 index 9e44672669..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-multiple/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-contribution-multiple - Apache Tuscany SCA Multiple Contribution Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/hello/Hello.java b/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/hello/Hello.java deleted file mode 100644 index 313a58a0bf..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/hello/Hello.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 hello; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the Hello service. - */ -public interface Hello { - - public String getGreetings(String name); -} diff --git a/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/hello/HelloImpl.java deleted file mode 100644 index ff9f6e75f3..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index c062afaed0..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java deleted file mode 100644 index a84a578344..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-multiple/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; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java deleted file mode 100644 index 9f0e5f9854..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES 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 contributio 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 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).toURL(); - URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).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://import-export/export-composite", helloContribution_URL, false); - - for (Composite deployable : helloContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.getCompositeBuilder().build(deployable); - } - for (Composite deployable : helloContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - - helloWorldContribution_one = - contributionService.contribute("http://import-export/helloworld_one", helloWorldContribution_one_URL, false); - for (Composite deployable : helloWorldContribution_one.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.getCompositeBuilder().build(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://import-export/export-composite"); - contributionService.remove("http://import-export/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/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml deleted file mode 100644 index bea6f39932..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite deleted file mode 100644 index aeeab337fa..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml deleted file mode 100644 index bfbf74373a..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite deleted file mode 100644 index 45cb504ea4..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution/DISCLAIMER b/branches/sca-java-1.0.1/itest/contribution/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/contribution/LICENSE b/branches/sca-java-1.0.1/itest/contribution/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/contribution/NOTICE b/branches/sca-java-1.0.1/itest/contribution/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/contribution/pom.xml b/branches/sca-java-1.0.1/itest/contribution/pom.xml deleted file mode 100644 index b45386fc58..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-contribution - Apache Tuscany SCA Contribution Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-contribution-impl - 1.0.1-incubating-SNAPSHOT - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/AddService.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index 6392676e76..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/AddService.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 calculator; - -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index e9c635e3c8..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 40ca4d9b0f..0000000000 --- a/branches/sca-java-1.0.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.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/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/CalculatorService.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index ad87375529..0000000000 --- a/branches/sca-java-1.0.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; - - -/** - * 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/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index ae4ed12b7b..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/DivideService.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index 3158458b5e..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/DivideService.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 calculator; - -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 8c33862f6d..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/MultiplyService.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 62db05175e..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/MultiplyService.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 calculator; - -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c7fbc73c00..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/SubtractService.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 309f88f098..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/SubtractService.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 calculator; - -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.0.1/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 1a7f145ad8..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution/src/main/resources/ContributionTest.composite b/branches/sca-java-1.0.1/itest/contribution/src/main/resources/ContributionTest.composite deleted file mode 100644 index d814e439e2..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/src/main/resources/ContributionTest.composite +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution/src/main/resources/calculator/Calculator.composite b/branches/sca-java-1.0.1/itest/contribution/src/main/resources/calculator/Calculator.composite deleted file mode 100644 index 657a2f95d8..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/src/main/resources/calculator/Calculator.composite +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/branches/sca-java-1.0.1/itest/contribution/src/main/resources/calculator/sca-contribution.xml deleted file mode 100644 index e95796d83a..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/branches/sca-java-1.0.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java deleted file mode 100644 index 946f505ead..0000000000 --- a/branches/sca-java-1.0.1/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.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.contribution; - -import java.io.File; -import java.io.InputStream; -import java.net.URL; -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.Contribution; -import org.apache.tuscany.sca.contribution.DeployedArtifact; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl; -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; - - @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(); - } - - 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; - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId, contributionLocation, resolver, false); - assertNotNull(contributionService.getContribution(contributionId)); - } - - public void testStoreContributionPackageInRepository() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId, contributionLocation, resolver, 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()); - } - - public void testStoreContributionStreamInRepository() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - - InputStream contributionStream = contributionLocation.openStream(); - try { - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId, contributionLocation, contributionStream, resolver); - } 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()); - } - - public void testStoreDuplicatedContributionInRepository() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId1 = CONTRIBUTION_001_ID; - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId1, contributionLocation, resolver, true); - assertNotNull(contributionService.getContribution(contributionId1)); - String contributionId2 = CONTRIBUTION_002_ID; - ModelResolver resolver2 = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId2, contributionLocation, resolver2, true); - assertNotNull(contributionService.getContribution(contributionId2)); - } - - public void testContributeFolder() throws Exception { - 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); - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - contributionService.contribute(contributionId, rootContributionFolder.toURL(), resolver, false); - assertNotNull(contributionService.getContribution(contributionId)); - } - - public void testAddDeploymentComposites() throws Exception { - URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION); - String contributionId = CONTRIBUTION_001_ID; - ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader()); - Contribution contribution = contributionService.contribute(contributionId, contributionLocation, resolver, 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()); - - DeployedArtifact artifact = null; - contribution = contributionService.getContribution(contributionId); - String id = artifactId.toString(); - for (DeployedArtifact a : contribution.getArtifacts()) { - if (id.equals(a.getURI())) { - artifact = a; - break; - } - } - Composite composite2 = (Composite)artifact.getModel(); - assertEquals("contributionComposite", composite2.getName().toString()); - } - -} diff --git a/branches/sca-java-1.0.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/branches/sca-java-1.0.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar deleted file mode 100644 index 0ca3a1b781..0000000000 Binary files a/branches/sca-java-1.0.1/itest/contribution/src/test/resources/deployables/sample-calculator.jar and /dev/null differ diff --git a/branches/sca-java-1.0.1/itest/contribution/src/test/resources/repository/sample-calculator.jar b/branches/sca-java-1.0.1/itest/contribution/src/test/resources/repository/sample-calculator.jar deleted file mode 100644 index 0ca3a1b781..0000000000 Binary files a/branches/sca-java-1.0.1/itest/contribution/src/test/resources/repository/sample-calculator.jar and /dev/null differ diff --git a/branches/sca-java-1.0.1/itest/conversations-ws/DISCLAIMER b/branches/sca-java-1.0.1/itest/conversations-ws/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/conversations-ws/LICENSE b/branches/sca-java-1.0.1/itest/conversations-ws/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/conversations-ws/NOTICE b/branches/sca-java-1.0.1/itest/conversations-ws/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/conversations-ws/pom.xml b/branches/sca-java-1.0.1/itest/conversations-ws/pom.xml deleted file mode 100644 index 2a7704df4d..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-conversations-ws - Apache Tuscany SCA Conversations Over binding.ws Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.0.1-incubating-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java deleted file mode 100644 index 53dadc3dc7..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java deleted file mode 100644 index 640ec22a4f..0000000000 --- a/branches/sca-java-1.0.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 caonversational 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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java deleted file mode 100644 index 7a4c733fb0..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.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; - -import org.osoa.sca.ServiceReference; -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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java deleted file mode 100644 index 8f008fa711..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java deleted file mode 100644 index a8682c71a4..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java deleted file mode 100644 index f1a21cc18f..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java deleted file mode 100644 index a9f264da56..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.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; - -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - - -/** - * The callback interface used when testing caonversational 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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java deleted file mode 100644 index 3c833d676a..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java deleted file mode 100644 index accc1eee27..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java deleted file mode 100644 index b4fbaad662..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java deleted file mode 100644 index 6737d7fe99..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java deleted file mode 100644 index 42d5da0bc0..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java deleted file mode 100644 index 3e4ed440a4..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java deleted file mode 100644 index 8fe7c5b6ba..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java deleted file mode 100644 index 9a25f0f59a..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java deleted file mode 100644 index efcbdff06f..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java deleted file mode 100644 index 8454b3846b..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java deleted file mode 100644 index a7b5b1aff5..0000000000 --- a/branches/sca-java-1.0.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.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) -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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java deleted file mode 100644 index 344aa99dff..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/ConversationAge.composite b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/ConversationAge.composite deleted file mode 100644 index abd1c35ced..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/ConversationAge.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/conversationId.composite b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/conversationId.composite deleted file mode 100644 index e61eb08194..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/conversationId.composite +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/conversational.composite b/branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/conversational.composite deleted file mode 100644 index 5e1e1092f7..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/src/main/resources/conversational.composite +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java deleted file mode 100644 index 9cce341c60..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java deleted file mode 100644 index f3b4a92d6f..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java deleted file mode 100644 index 8480e04028..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/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/branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java deleted file mode 100644 index ee623f32e9..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java +++ /dev/null @@ -1,585 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * 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.After; -import org.junit.Before; -import org.junit.Test; - -public class ConversationalTestCase { - - private SCADomain domain; - private ConversationalClient conversationalStatelessClientStatelessService; - private ConversationalClient conversationalStatelessClientStatefulService; - private ConversationalClient conversationalStatefulClientStatelessService; - private ConversationalClient conversationalStatefulClientStatefulService; - private ConversationalClient conversationalStatelessClientRequestService; - private ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; - - @Before - public 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"); - - // 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()); - } - - } - - @After - public void tearDown() throws Exception { - domain.close(); - } - - // 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() { - conversationalStatelessClientStatefulService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulImpl.calls.toString()); - } - - @Test - public void testStatelessStatefulConversationWithCallback() { - 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() { - conversationalStatelessClientStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalServiceStatelessImpl.calls.toString()); - } - - @Test - public void testStatelessStatelessConversationWithCallback() { - 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() { - conversationalStatefulClientStatefulService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulImpl.calls.toString()); - } - - @Test - public void testStatefulStatefulConversationWithCallback() { - 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() { - conversationalStatefulClientStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalServiceStatelessImpl.calls.toString()); - } - - @Test - public void testStatefulStatelessConversationWithCallback() { - 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() { - ConversationalServiceRequestImpl.calls = new StringBuffer(); - conversationalStatelessClientRequestService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,", - ConversationalServiceRequestImpl.calls.toString()); - } - - @Test - public void testStatelessRequestConversationWithCallback() { - 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() { - ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString()); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() { - 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/branches/sca-java-1.0.1/itest/conversations/DISCLAIMER b/branches/sca-java-1.0.1/itest/conversations/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/conversations/LICENSE b/branches/sca-java-1.0.1/itest/conversations/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/conversations/NOTICE b/branches/sca-java-1.0.1/itest/conversations/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/conversations/pom.xml b/branches/sca-java-1.0.1/itest/conversations/pom.xml deleted file mode 100644 index ee164d88d5..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - itest-conversations - Apache Tuscany SCA Conversations Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.0.1-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.0.1-incubating-SNAPSHOT - runtime - - - diff --git a/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java deleted file mode 100644 index 53dadc3dc7..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java deleted file mode 100644 index 640ec22a4f..0000000000 --- a/branches/sca-java-1.0.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 caonversational 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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java deleted file mode 100644 index 7a4c733fb0..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.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; - -import org.osoa.sca.ServiceReference; -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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java deleted file mode 100644 index 8f008fa711..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java deleted file mode 100644 index 546382cfd1..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java deleted file mode 100644 index f1a21cc18f..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java deleted file mode 100644 index a9f264da56..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.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; - -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - - -/** - * The callback interface used when testing caonversational 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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java deleted file mode 100644 index 9deef312ac..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java deleted file mode 100644 index cffa76186a..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java deleted file mode 100644 index 1272c7ab7f..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java deleted file mode 100644 index 847b038881..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java deleted file mode 100644 index b77e4c0194..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java deleted file mode 100644 index 5b3906fc2c..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java deleted file mode 100644 index 8fe7c5b6ba..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java deleted file mode 100644 index 9a25f0f59a..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java deleted file mode 100644 index efcbdff06f..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java deleted file mode 100644 index 8454b3846b..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java deleted file mode 100644 index a7b5b1aff5..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/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.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) -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/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/branches/sca-java-1.0.1/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java deleted file mode 100644 index 344aa99dff..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/main/resources/ConversationAge.composite b/branches/sca-java-1.0.1/itest/conversations/src/main/resources/ConversationAge.composite deleted file mode 100644 index abd1c35ced..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/src/main/resources/ConversationAge.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/conversations/src/main/resources/conversationId.composite b/branches/sca-java-1.0.1/itest/conversations/src/main/resources/conversationId.composite deleted file mode 100644 index e61eb08194..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/src/main/resources/conversationId.composite +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/conversations/src/main/resources/conversational.composite b/branches/sca-java-1.0.1/itest/conversations/src/main/resources/conversational.composite deleted file mode 100644 index 77cafbea6b..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/src/main/resources/conversational.composite +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java deleted file mode 100644 index 3e750bdd1e..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java deleted file mode 100644 index cc31c77873..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java deleted file mode 100644 index 8480e04028..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java deleted file mode 100644 index d41e4af482..0000000000 --- a/branches/sca-java-1.0.1/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java +++ /dev/null @@ -1,580 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * 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.After; -import org.junit.Before; -import org.junit.Test; - -public class ConversationalTestCase { - - private SCADomain domain; - private ConversationalClient conversationalStatelessClientStatelessService; - private ConversationalClient conversationalStatelessClientStatefulService; - private ConversationalClient conversationalStatefulClientStatelessService; - private ConversationalClient conversationalStatefulClientStatefulService; - private ConversationalClient conversationalStatelessClientRequestService; - private ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService; - - @Before - public 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"); - - // 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()); - } - - } - - @After - public void tearDown() throws Exception { - domain.close(); - } - - // 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() { - conversationalStatelessClientStatefulService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulImpl.calls.toString()); - } - - @Test - public void testStatelessStatefulConversationWithCallback() { - 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() { - conversationalStatelessClientStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalServiceStatelessImpl.calls.toString()); - } - - @Test - public void testStatelessStatelessConversationWithCallback() { - 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() { - conversationalStatefulClientStatefulService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulImpl.calls.toString()); - } - - @Test - public void testStatefulStatefulConversationWithCallback() { - 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() { - conversationalStatefulClientStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,", - ConversationalServiceStatelessImpl.calls.toString()); - } - - @Test - public void testStatefulStatelessConversationWithCallback() { - 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() { - ConversationalServiceRequestImpl.calls = new StringBuffer(); - conversationalStatelessClientRequestService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,", - ConversationalServiceRequestImpl.calls.toString()); - } - - @Test - public void testStatelessRequestConversationWithCallback() { - 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() { - ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer(); - conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope(); - Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,", - ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString()); - } - - @Test - public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() { - 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/branches/sca-java-1.0.1/itest/databindings/common/DISCLAIMER b/branches/sca-java-1.0.1/itest/databindings/common/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/LICENSE b/branches/sca-java-1.0.1/itest/databindings/common/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/NOTICE b/branches/sca-java-1.0.1/itest/databindings/common/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/pom.xml b/branches/sca-java-1.0.1/itest/databindings/common/pom.xml deleted file mode 100644 index e379c0499d..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - org.apache.tuscany.sca - itest-databindings - 1.0.1-incubating-SNAPSHOT - - - 4.0.0 - - itest-databindings-common - 1.0.1-incubating-SNAPSHOT - jar - Apache Tuscany SCA Databinding Common Integration Tests - - - - - 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 - - - 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.0-incubating - - - generate-sdo - generate-sources - - - - ${basedir}/src/main/resources/generate/generate.xsd - - - true - true - true - - - generate - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/branches/sca-java-1.0.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java deleted file mode 100644 index 73dfebb73c..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.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.generate; - -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.TemplateType; -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 file - * add a line to pom for code gen - * 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 conveniet 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 confiured file holds a list of types - // that the velocity templates expand into appropriate methods and method calls - List fileList = generateType.getInputFile(); - - //Intialise 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); - FileWriter fw = new FileWriter(filename); - 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 mainline - * - * @param args the target directory where project in which files are being generated - */ - public static void main(String[] args) { - Generate gen = new Generate(); - gen.generate(args[0]); - } - -} diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm deleted file mode 100644 index b2346aa973..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm deleted file mode 100644 index 88616cc997..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm deleted file mode 100644 index b0e298b823..0000000000 --- a/branches/sca-java-1.0.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 automcatically 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/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm deleted file mode 100644 index ee73db6152..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm deleted file mode 100644 index 57827d27b9..0000000000 --- a/branches/sca-java-1.0.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 automcatically 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/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm deleted file mode 100644 index 1fd7509667..0000000000 --- a/branches/sca-java-1.0.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 automcatically 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/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/generate.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/generate.xsd deleted file mode 100644 index 1fabedf55f..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/generate/generate.xsd +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/wsdl/Dummy.txt deleted file mode 100644 index 8927d725b6..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml deleted file mode 100644 index f1f4346e58..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Annotation.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Annotation.xsd deleted file mode 100644 index 1fae43eb09..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml deleted file mode 100644 index c20c80b658..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Attribute.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd deleted file mode 100644 index bd3db2e030..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Attribute.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml deleted file mode 100644 index 30e4979dca..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd deleted file mode 100644 index e7738dcff7..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml deleted file mode 100644 index 9552421e2d..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd deleted file mode 100644 index c7b9655749..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml deleted file mode 100644 index 5e5e7fbd55..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd deleted file mode 100644 index 5c455c2ab5..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml deleted file mode 100644 index 635e851632..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd deleted file mode 100644 index 004dab4fbb..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml deleted file mode 100644 index 136092951b..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd deleted file mode 100644 index 796f08e1cf..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml deleted file mode 100644 index 927b94885c..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd deleted file mode 100644 index 93f83cd0a1..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml deleted file mode 100644 index ea7db70595..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd deleted file mode 100644 index c64323e7e1..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml deleted file mode 100644 index 85c7d85fd4..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd deleted file mode 100644 index 543f276c50..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml deleted file mode 100644 index fcd281539b..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd deleted file mode 100644 index 1610c2b861..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml deleted file mode 100644 index 36a0760a61..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - anySimpleType - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd deleted file mode 100644 index 999b72bb35..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml deleted file mode 100644 index 5849165fe0..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd deleted file mode 100644 index 71dad561ca..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml deleted file mode 100644 index 8acf9376d7..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - http://tempuri.org - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd deleted file mode 100644 index a49987c352..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml deleted file mode 100644 index a35b6e174a..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ABCDEF - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd deleted file mode 100644 index e1995890f9..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml deleted file mode 100644 index 91cfce51b8..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - true - false - 1 - 0 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd deleted file mode 100644 index a2f86ba8c5..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml deleted file mode 100644 index 907474cd1b..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 127 - -127 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd deleted file mode 100644 index a2f6bcfa77..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml deleted file mode 100644 index c5820e1a2e..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 2001-01-01 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd deleted file mode 100644 index f4d596bfe3..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml deleted file mode 100644 index 0debe2fec5..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 2001-12-31T12:00:00 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd deleted file mode 100644 index b5bcfdcfd4..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml deleted file mode 100644 index 7f001254cc..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - -1.23456789 - 1.23456789 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd deleted file mode 100644 index 8d4d106f59..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml deleted file mode 100644 index f875b9f94d..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 0.0 - 12.3E-4 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd deleted file mode 100644 index 4c8a39b06c..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml deleted file mode 100644 index 7d343d6dda..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - P1D - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd deleted file mode 100644 index bb12bc04a9..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml deleted file mode 100644 index 7a81f3b0dd..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 0.0 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd deleted file mode 100644 index f0e1c21233..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml deleted file mode 100644 index d35568b3c9..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ---01 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd deleted file mode 100644 index 92bd9a4b66..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml deleted file mode 100644 index 52cdfa8c4e..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - --01-- - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd deleted file mode 100644 index 78d001a585..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml deleted file mode 100644 index 2609a858f7..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - --01-01 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd deleted file mode 100644 index 38f6c55059..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml deleted file mode 100644 index 7868a47ca3..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 2001 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd deleted file mode 100644 index 0d65b124ff..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml deleted file mode 100644 index 3f5080d49f..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 2001-01 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd deleted file mode 100644 index 340555dc5f..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml deleted file mode 100644 index 0deb7af980..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 0F00 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd deleted file mode 100644 index 8059fe6da0..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml deleted file mode 100644 index 06c92ce19b..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - idvalue0 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd deleted file mode 100644 index 7b1f02d1d4..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml deleted file mode 100644 index 9bc0cefd0f..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - idvalue0 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd deleted file mode 100644 index 0c207983bc..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml deleted file mode 100644 index f91b602f99..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - idvalue0 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd deleted file mode 100644 index b99bf01b73..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml deleted file mode 100644 index c99698e175..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - -2147483648 - 2147483647 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd deleted file mode 100644 index b5b9b0d1eb..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml deleted file mode 100644 index 80d22ce057..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - -2147483648 - 2147483647 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd deleted file mode 100644 index 4902935db5..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml deleted file mode 100644 index 664bf824b4..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - EN - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd deleted file mode 100644 index 5d3658d224..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml deleted file mode 100644 index c5861fa92a..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - -9223372036854775808 - 9223372036854775807 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd deleted file mode 100644 index 0aa4710057..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml deleted file mode 100644 index 1f95950394..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - NCName - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd deleted file mode 100644 index 6ee9c435db..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml deleted file mode 100644 index 0297f1aeb4..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - NMTOKEN - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd deleted file mode 100644 index 56d027bdbb..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml deleted file mode 100644 index 81ba1069bd..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - NMTOKENS - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd deleted file mode 100644 index 866ab73024..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml deleted file mode 100644 index 8bb3a08b94..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - tns:BuiltInNotationNotation - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd deleted file mode 100644 index c7c62f812b..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml deleted file mode 100644 index 8235718c5e..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - Name - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd deleted file mode 100644 index 36caba2f16..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml deleted file mode 100644 index 599c428a44..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - -1 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd deleted file mode 100644 index 389d5a99f0..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml deleted file mode 100644 index 919c4a20ee..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 0 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd deleted file mode 100644 index 59887078b5..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml deleted file mode 100644 index 79011f26ab..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - -1 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd deleted file mode 100644 index 5de7d64d7b..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml deleted file mode 100644 index c40be9e18b..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - normalizedString - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd deleted file mode 100644 index d4a78787b8..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml deleted file mode 100644 index c30434de66..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 1 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd deleted file mode 100644 index 5381590cd1..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml deleted file mode 100644 index 4cd6ea7e72..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - QName - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd deleted file mode 100644 index e8faf6225b..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml deleted file mode 100644 index b4375467c4..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - -32768 - 32767 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd deleted file mode 100644 index a4f564d9b7..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml deleted file mode 100644 index d30ab85530..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - string - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd deleted file mode 100644 index 8abb34b5a5..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml deleted file mode 100644 index 7fd9a061ae..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd deleted file mode 100644 index 1615976813..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml deleted file mode 100644 index cd567ba528..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - token - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd deleted file mode 100644 index 0beaac571f..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml deleted file mode 100644 index 025362defb..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 0 - 255 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd deleted file mode 100644 index d6d951fe5d..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml deleted file mode 100644 index 5736a8c121..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 0 - 4294967295 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd deleted file mode 100644 index 242be1d53b..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml deleted file mode 100644 index d728115a77..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 0 - 18446744073709551615 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd deleted file mode 100644 index 108e3a8619..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml deleted file mode 100644 index d4ffae5e17..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 0 - 65535 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd deleted file mode 100644 index 5ee5e0229e..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml deleted file mode 100644 index 3d5aed5aa8..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd deleted file mode 100644 index e7b80ab11c..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml deleted file mode 100644 index 2b4fe5594e..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - SimpleTypeWithName - SimpleTypeWithNameExtended - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd deleted file mode 100644 index fc4deb63c2..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml deleted file mode 100644 index 03570f41d9..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ComplexTypeExtendingSimpeTypeElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd deleted file mode 100644 index c754502645..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml deleted file mode 100644 index 4603793bfc..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ComplexTypeSimpleContentRestrictingComplexTypeElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd deleted file mode 100644 index 4bcd2f8c46..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml deleted file mode 100644 index a6861f803a..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - BaseElement - ExtensionElement - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd deleted file mode 100644 index 8bb251cab2..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml deleted file mode 100644 index 467ec007ed..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - Some - ]]> - Mixed - SimpleType]]>WithName - Content - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd deleted file mode 100644 index 8d00646678..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml deleted file mode 100644 index 7deafd798a..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd deleted file mode 100644 index 72ac75fee0..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml deleted file mode 100644 index f6208f81b3..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Some - Mixed - SimpleTypeWithName - Content - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd deleted file mode 100644 index 1f26e13673..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml deleted file mode 100644 index 97de7b98eb..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd deleted file mode 100644 index 67716553d8..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml deleted file mode 100644 index 5941348921..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - Some - Mixed - SimpleTypeWithName - Content - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd deleted file mode 100644 index 24d5d09054..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml deleted file mode 100644 index f684d06a4d..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - SomeData - - - idvalue2 - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd deleted file mode 100644 index de4a8a666d..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml deleted file mode 100644 index 242908bd27..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd deleted file mode 100644 index 4c00fbe295..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml deleted file mode 100644 index 925e8625d5..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd deleted file mode 100644 index b12bec040b..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml deleted file mode 100644 index c73708ce46..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd deleted file mode 100644 index 795c3ea7d9..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml deleted file mode 100644 index 3ebdc89ae0..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd deleted file mode 100644 index 21546d0f67..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml deleted file mode 100644 index 89657e42ca..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithName - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd deleted file mode 100644 index d01b4172e4..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml deleted file mode 100644 index 82fd1eedaf..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd deleted file mode 100644 index e1dcf06194..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml deleted file mode 100644 index ebf03c9d5d..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - ElementInAllOne - ElementInAllTwo - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd deleted file mode 100644 index 8b9ba5b4b8..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml deleted file mode 100644 index 26466b1b39..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - Element1InChoice - Element2InChoice - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd deleted file mode 100644 index ff418c56ab..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml deleted file mode 100644 index 27bb1ce9cc..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - ChangeSummaryText - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd deleted file mode 100644 index 2bf1df8c99..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml deleted file mode 100644 index 9b5561ed43..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementOfSimpleTypeWithDefaultDefault - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd deleted file mode 100644 index 0b4e7bdf45..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml deleted file mode 100644 index f1b7cd264c..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementOfSimpleTypeWithFixedFixed - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd deleted file mode 100644 index a2c8456257..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml deleted file mode 100644 index 1f60b0423f..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementOfSimpleTypeWithSDODataTypeElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd deleted file mode 100644 index 21e55ab8c1..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml deleted file mode 100644 index 30762f4912..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - idvalue0 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd deleted file mode 100644 index 5bf35d0d70..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml deleted file mode 100644 index 2dd01e4090..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - idvalue0 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd deleted file mode 100644 index 6920cd8dd0..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml deleted file mode 100644 index 6a526bdc47..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementOfSimpleTypeWithSDOStringElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd deleted file mode 100644 index 1117a95eb8..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml deleted file mode 100644 index ab91458bff..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - ElementInSubstitutionGroupBase - - - - Some Data - - - - ElementInSubstitutionGroupBase - - - ElementInSubstitutionGroupExtends - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd deleted file mode 100644 index 3e015843b5..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml deleted file mode 100644 index b6d68fd08a..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - ElementWithMaxOccursElement1 - ElementWithMaxOccursElement2 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd deleted file mode 100644 index d4453a4477..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml deleted file mode 100644 index 6de3adc937..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementWithNillableElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd deleted file mode 100644 index 786ab226da..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml deleted file mode 100644 index 64093aa803..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementWithSDOAliasName - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd deleted file mode 100644 index 01f4c2b1ef..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml deleted file mode 100644 index 774646f682..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - ElementWithSDONameElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd deleted file mode 100644 index 34da37564c..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml deleted file mode 100644 index a1fb3aa803..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd deleted file mode 100644 index 8eb7a4fce4..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml deleted file mode 100644 index f68eb1939d..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - GlobalElementSimpleType - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd deleted file mode 100644 index b9f77e6658..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Import.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Import.xml deleted file mode 100644 index fd28850050..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Import.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - SimpleTypeWithName - - SomeString - SomeString - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Import.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Import.xsd deleted file mode 100644 index eae93fd44a..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Import.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd deleted file mode 100644 index a7e568decf..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Include.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Include.xml deleted file mode 100644 index d4b9e24fa6..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Include.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Include.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Include.xsd deleted file mode 100644 index 34ff314a19..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Include.xsd +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd deleted file mode 100644 index ae22ab2c44..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Interop.xsd +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Notation.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Notation.xml deleted file mode 100644 index b75ac6500a..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Notation.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - -tns:Tuscany - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd deleted file mode 100644 index 6ad019cb81..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Notation.xsd +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Person.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Person.xsd deleted file mode 100644 index 5f5021b15e..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/Person.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml deleted file mode 100644 index 6c5ad88ff4..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd deleted file mode 100644 index 6b7e39b334..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml deleted file mode 100644 index f9d4a24a49..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithAbstractExtensionElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd deleted file mode 100644 index f649e2ba83..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml deleted file mode 100644 index 410df4b7e4..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithExtendedInstanceClassElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd deleted file mode 100644 index 36629e8295..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml deleted file mode 100644 index 7b74867c03..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithInstanceClassElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd deleted file mode 100644 index 7a08de84be..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml deleted file mode 100644 index 708d526f44..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - listmember1 listmember2 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd deleted file mode 100644 index 681cf7d5af..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml deleted file mode 100644 index e404ac86b7..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithNameElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd deleted file mode 100644 index af0431f048..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml deleted file mode 100644 index c86a0f6bcb..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithSDONameElement - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd deleted file mode 100644 index 89b00a36cc..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml deleted file mode 100644 index 399b0d8175..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - EN - 01:02:03 - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd deleted file mode 100644 index fee04b9f24..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml deleted file mode 100644 index bc8cf35368..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - SimpleTypeWithoutName - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd deleted file mode 100644 index 536aa822de..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml deleted file mode 100644 index da2929776e..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - SimpleTypeWithName - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd deleted file mode 100644 index ace5427786..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/datagraph.xsd deleted file mode 100644 index e6b9697a8d..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd deleted file mode 100644 index 7387568942..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd deleted file mode 100644 index c5aabc9cc8..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/branches/sca-java-1.0.1/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java deleted file mode 100644 index fa3f310d4d..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/config.png b/branches/sca-java-1.0.1/itest/databindings/config.png deleted file mode 100644 index 7912019e9d..0000000000 Binary files a/branches/sca-java-1.0.1/itest/databindings/config.png and /dev/null differ diff --git a/branches/sca-java-1.0.1/itest/databindings/config.svg b/branches/sca-java-1.0.1/itest/databindings/config.svg deleted file mode 100644 index aaf027e2df..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/databinding.png b/branches/sca-java-1.0.1/itest/databindings/databinding.png deleted file mode 100644 index 76a9c71b7d..0000000000 Binary files a/branches/sca-java-1.0.1/itest/databindings/databinding.png and /dev/null differ diff --git a/branches/sca-java-1.0.1/itest/databindings/databinding.svg b/branches/sca-java-1.0.1/itest/databindings/databinding.svg deleted file mode 100644 index d6850ccf7d..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/databinding.svg +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - GreeterService - - DefaultGreeterServiceClient - - - GreeterServiceComponent - - WSGreeterServiceClient - - - - - WSReference WSService - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/interop.png b/branches/sca-java-1.0.1/itest/databindings/interop.png deleted file mode 100644 index 005e0f24ea..0000000000 Binary files a/branches/sca-java-1.0.1/itest/databindings/interop.png and /dev/null differ diff --git a/branches/sca-java-1.0.1/itest/databindings/interop.svg b/branches/sca-java-1.0.1/itest/databindings/interop.svg deleted file mode 100644 index 03897c6d09..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/interop/DISCLAIMER b/branches/sca-java-1.0.1/itest/databindings/interop/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/interop/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/databindings/interop/LICENSE b/branches/sca-java-1.0.1/itest/databindings/interop/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/interop/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/interop/NOTICE b/branches/sca-java-1.0.1/itest/databindings/interop/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/interop/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/databindings/interop/pom.xml b/branches/sca-java-1.0.1/itest/databindings/interop/pom.xml deleted file mode 100644 index 3288ba72b3..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/interop/pom.xml +++ /dev/null @@ -1,223 +0,0 @@ - - - - - org.apache.tuscany.sca - itest-databindings - 1.0.1-incubating-SNAPSHOT - - - 4.0.0 - - itest-databindings-interop - 1.0.1-incubating-SNAPSHOT - jar - Apache Tuscany SCA DataBinding Interop Integration Tests - - - - - 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-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.bind - jaxb-impl - 2.1.4 - runtime - - - com.sun.xml.ws - jaxws-rt - 2.1.1 - - - 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.0.1-incubating-SNAPSHOT - 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/branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm deleted file mode 100644 index 7bdfc57924..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm deleted file mode 100644 index 38bfccce0c..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm deleted file mode 100644 index 6f02af4c9d..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/generate.xml b/branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/generate.xml deleted file mode 100644 index 8453dd56b4..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/branches/sca-java-1.0.1/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm deleted file mode 100644 index 36797fde57..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/jaxbgen/DISCLAIMER b/branches/sca-java-1.0.1/itest/databindings/jaxbgen/DISCLAIMER deleted file mode 100644 index d68a410903..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/jaxbgen/DISCLAIMER +++ /dev/null @@ -1,8 +0,0 @@ -Apache Tuscany is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is -required of all newly accepted projects until a further review indicates that -the infrastructure, communications, and decision making process have stabilized -in a manner consistent with other successful ASF projects. While incubation -status is not necessarily a reflection of the completeness or stability of the -code, it does indicate that the project has yet to be fully endorsed by the ASF. - diff --git a/branches/sca-java-1.0.1/itest/databindings/jaxbgen/LICENSE b/branches/sca-java-1.0.1/itest/databindings/jaxbgen/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/jaxbgen/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/jaxbgen/NOTICE b/branches/sca-java-1.0.1/itest/databindings/jaxbgen/NOTICE deleted file mode 100644 index 94481d6cfa..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/jaxbgen/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.0.1/itest/databindings/jaxbgen/pom.xml b/branches/sca-java-1.0.1/itest/databindings/jaxbgen/pom.xml deleted file mode 100644 index c71db0da42..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/jaxbgen/pom.xml +++ /dev/null @@ -1,251 +0,0 @@ - - - - - org.apache.tuscany.sca - itest-databindings - 1.0.1-incubating-SNAPSHOT - - - 4.0.0 - - itest-databindings-jaxb - 1.0.1-incubating-SNAPSHOT - jar - Apache Tuscany SCA JAXB Databinding Integration Tests - - - - - 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-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.0.1-incubating-SNAPSHOT - runtime - - - javax.xml.bind - jaxb-api - 2.1 - compile - - - com.sun.xml.bind - jaxb-impl - 2.1.4 - runtime - - - com.sun.xml.ws - jaxws-rt - 2.1.1 - - - - - - - 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 - - - process-resources - - wsimport - - - - - org.apache.tuscany.sca.itest.jaxbdatabinding.generated - ${project.build.directory}/classes/wsdl - - Greeter.wsdl - - ${project.build.directory}/jaxws-source - true - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/branches/sca-java-1.0.1/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml deleted file mode 100644 index 8381a164ea..0000000000 --- a/branches/sca-java-1.0.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/branches/sca-java-1.0.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/branches/sca-java-1.0.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite deleted file mode 100644 index ae0740e6fe..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/jaxbgen/src/main/resources/greeter.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.0.1/itest/databindings/pom.xml b/branches/sca-java-1.0.1/itest/databindings/pom.xml deleted file mode 100644 index e1467ebde6..0000000000 --- a/branches/sca-java-1.0.1/itest/databindings/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - org.apache.tuscany.sca - tuscany-itest - 1.0.1-incubating-SNAPSHOT - ../pom.xml - - 4.0.0 - - org.apache.tuscany.sca - itest-databindings - Apache Tuscany SCA Databindings Integration Tests - 1.0.1-incubating-SNAPSHOT - - - pom - - install - - - common - sdogen - jaxbgen - interop - - diff --git a/branches/sca-java-1.0.1/itest/databindings/readme.html b/branches/sca-java-1.0.1/itest/databindings/readme.html deleted file mode 100644 index 24a44e4ed7..0000000000 --- a/branches/sca-java-1.0.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