summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-0.99/samples
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-java-0.99/samples')
-rw-r--r--branches/sca-java-0.99/samples/README271
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/README74
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/build.xml51
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/pom.xml78
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java30
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java33
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java34
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java83
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java155
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java48
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java71
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java58
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java74
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java74
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java41
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java36
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java43
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java78
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java48
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java26
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java29
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java33
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java43
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java60
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java78
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java52
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory19
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor21
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory19
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/Echo.java29
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java44
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java50
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java50
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/EchoBinding.composite41
-rw-r--r--branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/definitions.xml198
-rw-r--r--branches/sca-java-0.99/samples/binding-echo/README99
-rw-r--r--branches/sca-java-0.99/samples/binding-echo/binding-echo.pngbin7846 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/binding-echo/binding-echo.svg174
-rw-r--r--branches/sca-java-0.99/samples/binding-echo/build.xml75
-rw-r--r--branches/sca-java-0.99/samples/binding-echo/pom.xml71
-rw-r--r--branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/Echo.java29
-rw-r--r--branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoBindingClient.java51
-rw-r--r--branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java44
-rw-r--r--branches/sca-java-0.99/samples/binding-echo/src/main/resources/EchoBinding.composite40
-rw-r--r--branches/sca-java-0.99/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java57
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/README95
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/binding-notification-broker.pngbin36945 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/pom.xml76
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java24
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java30
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java39
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java36
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java69
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType36
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite63
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl50
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-consumer/README89
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-consumer/binding-notification-consumer.pngbin27279 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-consumer/pom.xml96
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java30
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java39
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java46
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType36
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite54
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl50
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/README118
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/binding-notification-producer.pngbin21631 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/pom.xml100
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java24
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java30
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java36
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java54
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType36
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite45
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl50
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java56
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.componentType36
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.composite45
-rw-r--r--branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/wsdl/TrafficAdvisory.wsdl50
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/README297
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/build.xml229
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.pngbin76839 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.svg383
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/pom.xml101
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddService.java31
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java31
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java35
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java74
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractService.java31
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java31
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java114
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.java47
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite43
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite41
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite41
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite29
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite32
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java115
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/README138
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.pngbin23615 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.svg412
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/pom.xml68
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java44
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java39
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java68
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite42
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java60
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java52
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/README147
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.pngbin20814 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.svg330
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/pom.xml68
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java40
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java39
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java36
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java68
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite53
-rw-r--r--branches/sca-java-0.99/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java53
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/README105
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/calculator-script.pngbin23064 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/calculator-script.svg334
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/pom.xml78
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/AddService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorClient.java43
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorService.java34
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java69
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/DivideService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/MultiplyService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/SubtractService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/resources/Calculator.composite50
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js22
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy22
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py20
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb21
-rw-r--r--branches/sca-java-0.99/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java52
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/README117
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/build.xml148
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.pngbin25757 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.svg455
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/pom.xml85
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddService.java31
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddServiceImpl.java34
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorClient.java47
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorService.java35
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorServiceImpl.java69
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/Calculator.composite61
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl87
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml45
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/calc.jsp50
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/README118
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/build.xml86
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/calculator-web.pngbin22916 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/calculator-web.svg358
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/pom.xml65
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java47
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java35
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java69
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/resources/Calculator.composite49
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml35
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/calc.jsp50
-rw-r--r--branches/sca-java-0.99/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java52
-rw-r--r--branches/sca-java-0.99/samples/calculator/README97
-rw-r--r--branches/sca-java-0.99/samples/calculator/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/calculator/calculator.pngbin20552 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/calculator/calculator.svg329
-rw-r--r--branches/sca-java-0.99/samples/calculator/pom.xml64
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorClient.java45
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorService.java35
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java70
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractService.java28
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/main/resources/Calculator.composite49
-rw-r--r--branches/sca-java-0.99/samples/calculator/src/test/java/calculator/CalculatorTestCase.java52
-rw-r--r--branches/sca-java-0.99/samples/chat-webapp/README61
-rw-r--r--branches/sca-java-0.99/samples/chat-webapp/build.xml159
-rw-r--r--branches/sca-java-0.99/samples/chat-webapp/pom.xml73
-rw-r--r--branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatService.java28
-rw-r--r--branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java36
-rw-r--r--branches/sca-java-0.99/samples/chat-webapp/src/main/resources/chat.composite40
-rw-r--r--branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml42
-rw-r--r--branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/chat.html70
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/build.xml55
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/db.lckbin38 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log.ctrlbin48 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log1.datbin1048576 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/log/logmirror.ctrlbin48 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c10.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c101.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c111.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c121.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c130.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c141.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c150.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c161.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c171.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c180.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c191.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1a1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1b1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1c0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1d1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1e0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1f1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c20.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c200.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c211.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c221.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c230.datbin86016 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c241.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c251.datbin12288 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c260.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c271.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c281.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c290.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2a1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2b1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2c1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2d0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2e1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2f0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c300.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c31.datbin16384 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c311.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c320.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c331.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c340.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c351.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c360.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c371.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c380.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c391.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3a0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3b1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3c0.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3d1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3e0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3f1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c400.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c41.datbin16384 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c411.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c420.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c431.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c440.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c451.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c460.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c471.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c481.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c490.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c4a1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c51.datbin16384 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c60.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c71.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c81.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c90.datbin20480 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ca1.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cb1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cc0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cd1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ce1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cf0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/dastest/service.properties39
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/pom.xml86
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/readme.html199
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASService.java61
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceException.java37
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java146
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/CompanyConfig.xml46
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/dasservice.composite34
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/log4j.properties29
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/Company.jsp93
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/context.xml25
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml25
-rw-r--r--branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml35
-rw-r--r--branches/sca-java-0.99/samples/company-das/pom.xml99
-rw-r--r--branches/sca-java-0.99/samples/company-das/readme.html110
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/main/java/das/DASService.java61
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceException.java37
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceImpl.java146
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/main/resources/dasservice.composite34
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/java/das/DASServiceTestCase.java53
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/CompanyConfig.xml52
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/db.lckbin38 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log.ctrlbin48 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log1.datbin1048576 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/logmirror.ctrlbin48 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c10.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c101.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c111.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c121.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c130.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c141.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c150.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c161.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c171.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c180.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c191.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1a1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1b1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1c0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1d1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1e0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1f1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c20.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c200.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c211.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c221.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c230.datbin86016 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c241.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c251.datbin12288 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c260.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c271.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c281.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c290.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2a1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2b1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2c1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2d0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2e1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2f0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c300.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c31.datbin16384 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c311.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c320.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c331.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c340.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c351.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c360.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c371.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c380.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c391.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3a0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3b1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3c0.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3d1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3e0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3f1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c400.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c41.datbin16384 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c411.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c420.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c431.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c440.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c451.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c460.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c471.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c481.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c490.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c4a1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c51.datbin16384 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c60.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c71.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c81.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c90.datbin20480 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ca1.datbin24576 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cb1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cc0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cd1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ce1.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cf0.datbin8192 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/service.properties39
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/README143
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/build.xml75
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/databinding-echo.pngbin23907 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/databinding-echo.svg408
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/pom.xml76
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java74
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java59
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Echo.java32
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java45
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface1.java32
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface2.java36
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/src/main/resources/EchoDataBinding.composite58
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl63
-rw-r--r--branches/sca-java-0.99/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java49
-rw-r--r--branches/sca-java-0.99/samples/feed-aggregator/README79
-rw-r--r--branches/sca-java-0.99/samples/feed-aggregator/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/feed-aggregator/pom.xml79
-rw-r--r--branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java100
-rw-r--r--branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SampleServer.java54
-rw-r--r--branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/Sort.java38
-rw-r--r--branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SortImpl.java58
-rw-r--r--branches/sca-java-0.99/samples/feed-aggregator/src/main/resources/FeedAggregator.composite60
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/README101
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/build-dojo.xml91
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/build.xml104
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.pngbin9947 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.svg177
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/pom.xml134
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java28
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java36
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/src/main/resources/jsonrpc.composite37
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html91
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml26
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml45
-rw-r--r--branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/style.css22
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/README90
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/build.xml92
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.pngbin9947 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg177
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/pom.xml73
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java28
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java36
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite37
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html75
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml26
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml45
-rw-r--r--branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/style.css22
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/README153
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.pngbin7549 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.svg150
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/pom.xml79
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java38
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java31
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java42
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite45
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/logging.properties30
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl79
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java74
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java55
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/README210
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/build.xml101
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.pngbin7549 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg150
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/pom.xml139
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java44
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java33
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java46
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java31
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java42
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite34
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite35
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/logging.properties30
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl88
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java69
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java55
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/README132
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.pngbin158 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.svg149
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/pom.xml79
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java33
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java46
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java33
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/helloworldws.composite33
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl79
-rw-r--r--branches/sca-java-0.99/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java62
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/README116
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/implementation-composite.pngbin47415 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/implementation-composite.svg658
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/pom.xml66
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/CompositeClient.java41
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Source.java24
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceCallback.java24
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceImpl.java55
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Target.java30
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/TargetImpl.java41
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite.composite41
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite2.composite33
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml25
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/main/resources/OuterComposite.composite39
-rw-r--r--branches/sca-java-0.99/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java51
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/README83
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/build.xml51
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/pom.xml77
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUD.java54
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java48
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java37
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java90
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java47
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java117
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java71
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java71
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java54
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory19
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor19
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory19
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java67
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud-extension/src/test/resources/crud.composite30
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud/README113
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud/build.xml75
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud/implementation-crud.pngbin4227 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud/implementation-crud.svg135
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud/pom.xml64
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java55
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud/src/main/resources/crud.composite30
-rw-r--r--branches/sca-java-0.99/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java58
-rw-r--r--branches/sca-java-0.99/samples/implementation-notification/README70
-rw-r--r--branches/sca-java-0.99/samples/implementation-notification/implementation-notification.pngbin21543 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/implementation-notification/pom.xml75
-rw-r--r--branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java24
-rw-r--r--branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java24
-rw-r--r--branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java39
-rw-r--r--branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java36
-rw-r--r--branches/sca-java-0.99/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java60
-rw-r--r--branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType30
-rw-r--r--branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite50
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/README70
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/build.xml51
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/pom.xml77
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java65
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java36
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java36
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java156
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java155
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java51
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java98
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java45
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor19
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory19
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory19
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java26
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java37
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java37
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java50
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType26
-rw-r--r--branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite33
-rw-r--r--branches/sca-java-0.99/samples/loanapplication/pom.xml65
-rw-r--r--branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java36
-rw-r--r--branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java37
-rw-r--r--branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClient.java29
-rw-r--r--branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java64
-rw-r--r--branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanService.java43
-rw-r--r--branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java63
-rw-r--r--branches/sca-java-0.99/samples/loanapplication/src/main/resources/loanapplication.composite34
-rw-r--r--branches/sca-java-0.99/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java83
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/pom.xml178
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java279
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java87
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java400
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java106
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java98
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java465
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java129
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java47
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java216
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java228
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java31
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java68
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java153
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/DasAccountConfiguration.xml79
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/AccountService.wsdl467
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl136
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/default.scdl80
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/web.xml70
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java56
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/docs/Show.Image.html40
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/docs/accountfiles.pngbin15889 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/docs/accountmodule.pngbin33300 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/docs/modualoverview.pngbin6074 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/docs/webclientfiles.pngbin17123 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/docs/webclientmodule.pngbin10748 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/pom.xml44
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/readme.html894
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/pom.xml167
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java117
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java64
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java36
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java42
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java69
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java51
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java120
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java135
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java81
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java85
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java101
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java107
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java161
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java96
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl466
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/CustomerProfile.jsp100
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld127
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl53
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/web.xml83
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountLog.jsp99
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountTransaction.jsp50
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/login.html60
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/purchaseStock.jsp59
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/stockSale.jsp56
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/summary.jsp144
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java45
-rw-r--r--branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java42
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/README77
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/build.xml51
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/pom.xml78
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBinding.java60
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingInvoker.java44
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingProviderFactory.java56
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoReferenceBindingProvider.java60
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoServiceBindingProvider.java73
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServer.java78
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServiceListener.java55
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor19
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory19
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/Echo.java29
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoComponentImpl.java44
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoReferenceTestCase.java50
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoServiceTestCase.java50
-rw-r--r--branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/resources/EchoBinding.composite40
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/README87
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/build.xml51
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/pom.xml77
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/CRUD.java54
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/backend/ResourceManager.java90
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementation.java128
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationInvoker.java70
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProvider.java69
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProviderFactory.java49
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor19
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory19
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/java/crud2/CRUDTestCase.java68
-rw-r--r--branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/resources/crud2.composite30
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/build-bundles.xml32
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/pom.xml187
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/readme.htm332
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java123
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java43
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java33
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java51
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java52
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java48
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java54
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java47
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java46
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java28
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java48
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java46
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java43
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java28
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java49
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java49
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java46
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java28
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Customer.componentType28
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt202
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE14
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/README.txt35
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Retailer.componentType28
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Shipper.componentType28
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Warehouse.componentType28
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf11
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf10
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf10
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf10
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf10
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml33
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf11
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml33
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf10
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml34
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf11
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml33
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.composite66
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite66
-rw-r--r--branches/sca-java-0.99/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java63
-rw-r--r--branches/sca-java-0.99/samples/pom.xml80
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/pom.xml168
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java30
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java30
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java29
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java29
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java30
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java27
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java30
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java29
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java28
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java42
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java31
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java31
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java67
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/TestHelper.java144
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq37
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq49
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq48
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd39
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd49
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd40
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/availquoteprovider.wsdl80
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl89
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotews.composite49
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite108
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java145
-rw-r--r--branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java50
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/README91
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/pom.xml72
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.pngbin10202 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.svg200
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java43
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java26
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java85
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java26
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java28
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java54
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java35
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java35
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java43
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java43
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java36
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java31
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml42
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/BigBank.composite35
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite30
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java50
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/README91
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/pom.xml65
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.pngbin10202 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.svg200
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java43
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java26
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java68
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java26
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java28
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java54
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java35
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java35
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java43
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java43
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java36
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java32
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/Account.composite38
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/BigBank.composite35
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/StockQuote.composite31
-rw-r--r--branches/sca-java-0.99/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java50
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/README134
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/pom.xml79
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.pngbin137 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.svg150
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java27
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java51
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java34
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java30
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java54
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java38
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/simplecallback.composite49
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl103
-rw-r--r--branches/sca-java-0.99/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java53
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/README97
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/pom.xml65
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/simple-callback.pngbin137 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/simple-callback.svg150
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClient.java27
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java49
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyService.java32
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java27
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java51
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java38
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/src/main/resources/simplecallback.composite34
-rw-r--r--branches/sca-java-0.99/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java51
-rw-r--r--branches/sca-java-0.99/samples/spi-implementation-pojo/pom.xml59
-rw-r--r--branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java35
-rw-r--r--branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java37
-rw-r--r--branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java59
-rw-r--r--branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java47
-rw-r--r--branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator18
-rw-r--r--branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java26
-rw-r--r--branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java28
-rw-r--r--branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java35
-rw-r--r--branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite28
-rw-r--r--branches/sca-java-0.99/samples/supplychain/README101
-rw-r--r--branches/sca-java-0.99/samples/supplychain/build.xml72
-rw-r--r--branches/sca-java-0.99/samples/supplychain/pom.xml65
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Customer.java33
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java44
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Retailer.java28
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java39
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Shipper.java28
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java39
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java40
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Warehouse.java28
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java39
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/main/resources/supplychain.composite45
-rw-r--r--branches/sca-java-0.99/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java52
-rw-r--r--branches/sca-java-0.99/samples/supplychain/supplychain.pngbin3898 -> 0 bytes
-rw-r--r--branches/sca-java-0.99/samples/supplychain/supplychain.svg228
-rw-r--r--branches/sca-java-0.99/samples/web-resource/README72
-rw-r--r--branches/sca-java-0.99/samples/web-resource/build.xml65
-rw-r--r--branches/sca-java-0.99/samples/web-resource/pom.xml79
-rw-r--r--branches/sca-java-0.99/samples/web-resource/src/main/java/web/resource/SampleServer.java44
-rw-r--r--branches/sca-java-0.99/samples/web-resource/src/main/resources/WebResource.composite32
-rw-r--r--branches/sca-java-0.99/samples/web-resource/src/main/resources/myContent/index.html49
832 files changed, 0 insertions, 44140 deletions
diff --git a/branches/sca-java-0.99/samples/README b/branches/sca-java-0.99/samples/README
deleted file mode 100644
index 67c84f3c37..0000000000
--- a/branches/sca-java-0.99/samples/README
+++ /dev/null
@@ -1,271 +0,0 @@
-The Apache Tuscany SCA Samples
-==============================
-The Apache Tuscany SCA samples are built as part of the main Maven build and
-run, using the provided JUnit test cases, as tests in the Maven build.
-
-In the binary distribution of Apache Tuscany the samples can also
-be run using the provided Ant build.xml files. These show the samples running
-from a simple main() method without the need for a JUnit test case.
-
-In these notes text that appears in angled brackets like this <example> means
-that you need to make a choice and provide your own text at that point.
-
-These simple samples have been created with the intention of illustrating the
-usage of the SCA API and annotations and certainly not to levels of SCA component
-abstraction. In real life situations you should use SCA to assemble real and
-usually bigger components, and when you do that you'll get all the benefits of
-SCA, bindings, policies, integration in an SOA environment etc..
-
-Sample Overview
----------------
-The samples generally show off different features of the SCA runtime
-and the extensions that come packaged with it. This list is ordered in a rough
-order of increasing complexity.
-
-calculator - A calculator built with java components and local
- wires
-calculator-script - The calculator but this time built using various
- script languages
-calculator-webapp - The calculator again but this time running inside a
- web app
-chat-webapp - A simple chat style web app demonsrating how to use
- the AJAX binding
-feed-aggregator - Demonstrates using the ATOM binding
-helloworld-ws-reference - The client side of a hello world sample that uses a
- web service binding
-helloworld-ws-service - The server side of a hello world sample that uses a
- web service binding
-helloworld-ws-sdo - helloworld using ws binding and SDO
-calculator-rmi-reference - The calculator configured to talk RMI to the
- calculator-rmi-service sample
-calculator-rmi-service - The calculator configured to accept RMI requests
- from calculator-rmi-reference
-helloworld-jsonrpc - An SCA application that exposes a service using
- JSONRPC
-helloworld-dojo - An SCA application that exposes a service using
- JSONRPC and a client using the Dojo toolkit
-simple-callback - An SCA application with two components demonstrating
- the callback interface
-simple-callback-ws - An SCA application with two components demonstrating
- the callback interface across the Web service binding
-implementation-composite - An SCA application that shows how composites are used to
- implement components
-supplychain - A more complicated sample showing how asynchronous
- callbacks can be used
-osgi-supplychain - the supplychain sample showing OSGi integration with
- SCA components using OSGi bundles
-databinding-echo - An SCA application that shows how databindings
- transform data
-simple-bigbank - A banking application built with java components
- and local wires
-binding-notification-* - A set of samples demonstrating Tuscany's support
-implementation-notification for PUB/SUB interactions
-
-calculator-distributed - Demonstrates distributed SCA domains with calculator
- components running in multiple JVMs
-
-There are two samples that demonstrate how to build extensions for the
-Tuscany SCA runtime. These samples are slightly different from the samples
-above in that the provided code is concerned with building the extension
-and not with building an application that uses it. The application
-that shows how the new extension can be used is provided in an associated
-sample.
-
-implementation-crud-extension - Shows how to build new implementation type
- extensions
-implementation-crud - A sample application that exercises the new
- implementation extensions
-binding-echo-extension - Shows how to build new binding extensions
-binding-echo - A sample application that exercises the new
- binding extension
-
-Sample Layout
--------------
-All sample directories are organized in the same way based on the default
-project template provided by Maven. For example, take a look at the calculator
-sample;
-
-calculator/
- src/ - Holds all of the source files for the sample
- main/ - Groups together the files that implement the sample
- java/ - Java source files
- resources/ - Non java resource files such as composte files
- test/ - Groups together files that provide sample tests
- java - Java test sources files. Usually JUnit test cases
- target/ - Holds the files generated when the sample is built
- classes/ - For example, Java class files
- test-classes/ - classes from src/test and other test files
-
-Getting Ready To Build
-----------------------
-You will need to install the following software before you start.
-
-J2SE Development Kit (JDK) 5.0
-Apache Ant 1.7.0 - if you are going to use Ant
-Apache Maven 2.0.6 - if you are going to use Maven
-
-Java and Ant and/or Maven binary directories must be present in your PATH so
-that their executable programs are available in your environment. You may
-find it useful to use a script to set up your environment, for example;
-
-For UNIX:
- JAVA_HOME=/<installation_directory>
- ANT_HOME=/<installation_directory>/apache-ant-1.7.0
- MAVEN_HOME=/<installation_directory>/maven-2.0.6
- export PATH=$JAVA_HOME/bin:$ANT_HOME/bin:$MAVEN_HOME/bin:$PATH
-
-For Windows:
- set JAVA_HOME=C:\<installation_directory>
- set ANT_HOME=C:\<installation_directory>\apache-ant-1.7.0
- set MAVEN_HOME=C:\<installation_directory>\maven-2.0.6
- set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%MAVEN_HOME%\bin;%PATH%
-
-
-Building And Running The SCA Samples Using Ant
-----------------------------------------------
-The build.xml files provided with the Apache Tuscany SCA samples are designed
-to work with the binary distribution. They rely on the tuscany-sca-manifest.jar
-to describe the class path and this jar is only provided as part of the
-binary distribution.
-
-The binary distribution of SCA also includes precompiled versions of each sample.
-If you look in the target directory of each sample you will see this jar file. To
-run a sample based on all of the precompiled artifacts all you have to do is:
-
-cd <sampledir>
-ant run
-
-Check each <sampledir>/README file as some samples require that two progams are
-run to get the desired result, for example, the two samples that show how
-to build extensions are run from their associated application samples.
-
-If you want to rebuild a sample, for example, if you have changed it, do the
-following:
-
-cd <sampledir>
-ant compile
-
-Once the sample is built you have the option of running the sample in whatever
-way best suits you. Two alternatives are provided in the ant build files.
-
-The compile target builds the class files and then builds the jar so you can use
-the same command as before:
-
-ant run
-
-This will use the generated jar to run the samples. The command line version of
-this is:
-
-on Windows
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\<sample jar file> <sample runnable class>
-
-for example : java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient
-
-on *nix
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/<sample jar file> <sample runnable class>
-
-for example : java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient
-
-
-You can use the compiled classes directly using
-
-ant run-classes
-
-The command line version of this is:
-
-on Windows
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\classes <sample runnable class>
-
-for example : java -cp ..\..\lib\tuscany-sca-manifest.jar;target\classes calculator.CalculatorClient
-
-on *nix
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/classes <sample runnable class>
-
-for example : java -cp ../../lib/tuscany-sca-manifest.jar:target/classes calculator.CalculatorClient
-
-The class specified on the command of course depends on which sample you want to
-run. In the examples we have used we are running the CalculatorClient from the calculator sample.
-
-
-Building And Running The SCA Samples Using Maven
-------------------------------------------------
-
-The Maven build process will work from both source and binary distributions.
-To build and test all of the Apache Tuscany SCA sources, including the samples,
-do the following.
-
-cd sca
-mvn
-
-This will take a little while to complete. Experience with Maven tells us that
-sometimes there are problems downloading the dependencies that Apache Tuscany
-SCA requires. If Maven reports that it cannot download required dependencies
-try running the Maven build again.
-
-Once you have all of the source built you can build and run each sample
-independently if required.
-
-cd <sampledir>
-mvn
-
-When using Maven the samples are run within JUnit test cases and so you will
-sometimes not see any test output. You will always see an indication of test
-success or failure.
-
-Using The Samples In An IDE
----------------------------------------------
-The easiest way to use the samples in an IDE is to use Maven to generate all
-of the IDE project files for you automatically. This works best if you
-generate IDE projects for all of the Apache Tuscany modules. You can then
-include the ones you are interested in working with in you IDE.
-
-To build IDE project files for all of the modules in Apache Tuscany SCA;
-
-cd sca
-
-If you are an Eclipse user do the following
-
-mvn -Peclipse eclipse:eclipse
-
-If you are an IDEA user do the following
-
-mvn idea:idea
-
-These commands generate project files for each module in Apache Tuscany SCA.
-The modules you are interested in can now be included in your IDE, for example,
-in Eclipse, if you create a new Java project and use the option to "create a
-new project from existing source" you can specify an SCA module directory,
-which includes the generated project files, and Eclipse will treat it like any
-other Java project.
-
-Using The Samples In An IDE Without Maven
------------------------------------------
-We don't provide any IDE project files with our distributions so you will have to
-import the sample files into your IDE manually. Here's an example of how it can be
-done using Eclipse.
-
-In a new or existing workspace
- Create a new java project to represent the sample you want to work on, e.g.
- calculator
- Import all of the sample code and resources into this project, e.g.
- File, Import and then select tuscany-sca-0.90-incubating\samples\calculator from the filesystem
- Configure the source path to include
- src/main/java
- src/main/resources
- Configure the output folder to be
- calculator/target
- Configure the build path to include all of the jars provided in
- lib
- If you select calculator.CalculatorClient.java and run as "Java Application" you should see
- 3 + 2=5.0
- 3 - 2=1.0
- 3 * 2=6.0
- 3 / 2=1.5
-
-The details of how to do this for other development environments will
-vary but the process will be similar.
-
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/README b/branches/sca-java-0.99/samples/binding-echo-extension/README
deleted file mode 100644
index 94716b151f..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/README
+++ /dev/null
@@ -1,74 +0,0 @@
-Binding Echo Sample
-===================
-This sample demonstrates how new bindings are constructed for Apache Tuscany
-SCA.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you want to try out the echo binding that this sample provides
-please see the binding-echo sample that provides the necessary client and
-application code to bring up an application that uses this binding
-
-Sample Overview
----------------
-This sample contains a implementation of an SCA binding that simply echoes back
-any messages that are sent to it.
-
-binding-echo-extension/
- src/
- main/
- java/
- echo/ - The binding interfaces
- impl/ - The bindings model classes
- provider/ - The bindings runtime classes
- server/ - A dummy server that the binding is plugged into
- resources/
- META-INF/
- services/ - The extension declaration
- test/
- java/
- echo/ - test code
- resources/
- EchoBinding.composite - the SCA assembly used by the unit test
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building The Sample Using Ant
------------------------------
-With the binary distribution the sample can be built using Ant as
-follows
-
-cd binding-echo-extension
-ant compile
-
-See the binding-echo sample to run a sample that uses this binding.
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd binding-echo-extension
-mvn
-
-Maven will also test that the sample extension built properly. You should see
-the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running echo.EchoServiceTestCase
-Returned message: oof
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.011 sec
-Running echo.EchoReferenceTestCase
-Returned message: oof
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.06 sec
-
-Results :
-
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
-
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/build.xml b/branches/sca-java-0.99/samples/binding-echo-extension/build.xml
deleted file mode 100644
index 5df5981bea..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/build.xml
+++ /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.
--->
-<project name="binding-echo-extension" default="compile">
- <property name="test.jar" value="sample-binding-echo-extension.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/pom.xml b/branches/sca-java-0.99/samples/binding-echo-extension/pom.xml
deleted file mode 100644
index 2c7dd5cbc5..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-echo-extension</artifactId>
- <name>Apache Tuscany Echo Binding Extension Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
deleted file mode 100644
index 16948874d1..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBinding.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 echo;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * A model for the sample Echo binding.
- */
-public interface EchoBinding extends Binding, PolicySetAttachPoint {
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
deleted file mode 100644
index 0f6fee82be..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.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 echo;
-
-/**
- * A factory for the sample Echo binding model.
- */
-public interface EchoBindingFactory {
-
- /**
- * Creates a new Echo binding.
- *
- * @return a new Echo binding
- */
- EchoBinding createEchoBinding();
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
deleted file mode 100644
index af759dbf93..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.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 echo.impl;
-
-import echo.EchoBinding;
-import echo.EchoBindingFactory;
-
-/**
- * A factory for the sample Echo binding model.
- */
-public class EchoBindingFactoryImpl implements EchoBindingFactory {
-
- public EchoBinding createEchoBinding() {
- return new EchoBindingImpl();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
deleted file mode 100644
index bf91880f76..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.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 echo.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-import echo.EchoBinding;
-
-/**
- * Implementation of the Echo binding model.
- */
-public class EchoBindingImpl implements EchoBinding {
-
- private String name;
- private String uri;
- private List<Intent> requiredIntents = new ArrayList<Intent>();
- private List<PolicySet> policySets = new ArrayList<PolicySet>();
- private IntentAttachPointType bindingType = null;
-
- public IntentAttachPointType getType() {
- return bindingType;
- }
-
- public void setType(IntentAttachPointType type) {
- this.bindingType = type;
- }
-
- public String getName() {
- return name;
- }
-
- public String getURI() {
- return uri;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setURI(String uri) {
- this.uri = uri;
- }
-
- public List<PolicySet> getPolicySets() {
- return policySets;
- }
-
- public List<Intent> getRequiredIntents() {
- return requiredIntents;
- }
-
- public boolean isUnresolved() {
- // The sample binding is always resolved
- return false;
- }
-
- public void setUnresolved(boolean unresolved) {
- // The sample binding is always resolved
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
deleted file mode 100644
index cd6ad97193..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package echo.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-import echo.EchoBinding;
-import echo.EchoBindingFactory;
-
-/**
- * A processor for <binding.echo> elements.
- */
-public class EchoBindingProcessor implements StAXArtifactProcessor<EchoBinding> {
-
- private QName BINDING_ECHO = new QName("http://echo", "binding.echo");
-
- private final EchoBindingFactory factory;
- private PolicyFactory policyFactory;
-
- public EchoBindingProcessor(EchoBindingFactory factory, PolicyFactory pFactory) {
- this.factory = factory;
- this.policyFactory = pFactory;
- }
-
- public QName getArtifactType() {
- return BINDING_ECHO;
- }
-
- public Class<EchoBinding> getModelType() {
- return EchoBinding.class;
- }
-
- public EchoBinding read(XMLStreamReader reader) throws ContributionReadException {
- EchoBinding echoBinding = factory.createEchoBinding();
-
- String name = reader.getAttributeValue(null, "name");
- if (name != null) {
- echoBinding.setName(name);
- }
- String uri = reader.getAttributeValue(null, "uri");
- if (uri != null) {
- echoBinding.setURI(uri);
- }
-
- readPolicies(echoBinding, null, reader);
- return echoBinding;
- }
-
- protected QName getQNameValue(XMLStreamReader reader, String value) {
- if (value != null) {
- int index = value.indexOf(':');
- String prefix = index == -1 ? "" : value.substring(0, index);
- String localName = index == -1 ? value : value.substring(index + 1);
- String ns = reader.getNamespaceContext().getNamespaceURI(prefix);
- if (ns == null) {
- ns = "";
- }
- return new QName(ns, localName, prefix);
- } else {
- return null;
- }
- }
-
- protected void readIntents(IntentAttachPoint attachPoint, Operation operation, XMLStreamReader reader) {
- String value = reader.getAttributeValue(null, "requires");
- if (value != null) {
- List<Intent> requiredIntents = attachPoint.getRequiredIntents();
- for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
- QName qname = getQNameValue(reader, tokens.nextToken());
- Intent intent = policyFactory.createIntent();
- intent.setName(qname);
- if (operation != null) {
- //intent.getOperations().add(operation);
- }
- requiredIntents.add(intent);
- }
- }
- }
-
- protected void readPolicies(PolicySetAttachPoint attachPoint, Operation operation, XMLStreamReader reader) {
- readIntents(attachPoint, operation, reader);
-
- String value = reader.getAttributeValue(null, "policySets");
- if (value != null) {
- List<PolicySet> policySets = attachPoint.getPolicySets();
- for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
- QName qname = getQNameValue(reader, tokens.nextToken());
- PolicySet policySet = policyFactory.createPolicySet();
- policySet.setName(qname);
- if (operation != null) {
- //policySet.getOperations().add(operation);
- }
- policySets.add(policySet);
- }
- }
- }
-
- public void write(EchoBinding echoBinding, XMLStreamWriter writer) throws ContributionWriteException {
- }
-
- public void resolve(EchoBinding echoBinding, ModelResolver resolver) throws ContributionResolveException {
- List<Intent> requiredIntents = new ArrayList<Intent>();
- Intent resolvedIntent = null;
- for ( Intent intent : echoBinding.getRequiredIntents() ) {
- resolvedIntent = resolver.resolveModel(Intent.class, intent);
- requiredIntents.add(resolvedIntent);
- }
- echoBinding.getRequiredIntents().clear();
- echoBinding.getRequiredIntents().addAll(requiredIntents);
-
- List<PolicySet> resolvedPolicySets = new ArrayList<PolicySet>();
- PolicySet resolvedPolicySet = null;
- for ( PolicySet policySet : echoBinding.getPolicySets() ) {
- resolvedPolicySet = resolver.resolveModel(PolicySet.class, policySet);
- resolvedPolicySets.add(resolvedPolicySet);
- }
- echoBinding.getPolicySets().clear();
- echoBinding.getPolicySets().addAll(resolvedPolicySets);
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
deleted file mode 100644
index 91697fcd9a..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.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 echo.provider;
-
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-/**
- * Invoker for the sample echo binding.
- */
-class EchoBindingInvoker implements Invoker {
-
- EchoBindingInvoker() {
- }
-
- public Message invoke(Message msg) {
- try {
- System.out.println("Passing thro invoker...");
- Object[] args = msg.getBody();
-
- // echo back the first parameter, a real binding would invoke some API for flowing the request
- Object result = args[0];
-
- msg.setBody(result);
-
- } catch (Exception e) {
- msg.setFaultBody(e);
- }
- return msg;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
deleted file mode 100644
index 485386cea8..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package echo.provider;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-import echo.provider.policy.PolicyHandler;
-import echo.provider.policy.EncryptionPolicyHandler;
-
-/**
- * Invoker that applies policies before invocation for the sample echo binding.
- */
-public class EchoBindingPoliciedInvoker implements Invoker {
- List<PolicySet> policies = null;
- Map<QName, PolicyHandler> policyHandlers = new HashMap<QName, PolicyHandler>();
-
- public EchoBindingPoliciedInvoker(List<PolicySet> policies) {
- this.policies = policies;
- policyHandlers.put(new QName("http://sample/policy","EncryptionPolicy"),
- new EncryptionPolicyHandler());
- }
-
- public Message invoke(Message msg) {
- try {
- Object[] args = msg.getBody();
-
- applyPolicies(args);
-
- // echo back the first parameter, a real binding would invoke some API for flowing the request
- Object result = args[0];
-
- msg.setBody(result);
-
- } catch (Exception e) {
- msg.setFaultBody(e);
- }
- return msg;
- }
-
- private void applyPolicies(Object[] args) throws Exception {
- for ( PolicySet policySet : policies ) {
- PolicyHandler policyHandler = policyHandlers.get(policySet.getName());
- policyHandler.applyPolicy(args, policySet);
- }
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
deleted file mode 100644
index ba74d8f99a..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.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 echo.provider;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-import echo.EchoBinding;
-
-
-/**
- * Implementation of the Echo binding model.
- */
-public class EchoBindingProviderFactory implements BindingProviderFactory<EchoBinding> {
-
- private MessageFactory messageFactory;
-
- public EchoBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
- ModelFactoryExtensionPoint factories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
- this.messageFactory = factories.getFactory(MessageFactory.class);
- }
-
- public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, EchoBinding binding) {
- return new EchoReferenceBindingProvider(component, reference, binding);
- }
-
- public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, EchoBinding binding) {
- return new EchoServiceBindingProvider(component, service, binding, messageFactory);
- }
-
- public Class<EchoBinding> getModelType() {
- return EchoBinding.class;
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
deleted file mode 100644
index 06c8df0080..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package echo.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-import echo.EchoBinding;
-
-/**
- * Implementation of the Echo binding provider.
- */
-class EchoReferenceBindingProvider implements ReferenceBindingProvider {
-
- private RuntimeComponentReference reference;
- private EchoBinding binding;
-
- EchoReferenceBindingProvider(RuntimeComponent component,
- RuntimeComponentReference reference,
- EchoBinding binding) {
- this.reference = reference;
- this.binding = binding;
- }
-
- public Invoker createInvoker(Operation operation, boolean isCallback) {
- if (isCallback) {
- throw new UnsupportedOperationException();
- } else {
- if ( !binding.getPolicySets().isEmpty() ){
- return new EchoBindingPoliciedInvoker(((PolicySetAttachPoint)binding).getPolicySets());
- } else {
- return new EchoBindingInvoker();
- }
- }
- }
-
- public InterfaceContract getBindingInterfaceContract() {
- return reference.getInterfaceContract();
- }
-
- public void start() {
- }
-
- public void stop() {
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
deleted file mode 100644
index 43354d1e90..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package echo.provider;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-import echo.EchoBinding;
-import echo.server.EchoServer;
-import echo.server.EchoServiceListener;
-
-/**
- * Implementation of the Echo binding provider.
- */
-class EchoServiceBindingProvider implements ServiceBindingProvider {
-
- private RuntimeComponent component;
- private RuntimeComponentService service;
- private EchoBinding binding;
- private MessageFactory messageFactory;
-
- EchoServiceBindingProvider(RuntimeComponent component,
- RuntimeComponentService service, EchoBinding binding, MessageFactory messageFactory) {
- this.component = component;
- this.service = service;
- this.binding = binding;
- this.messageFactory = messageFactory;
- }
-
- public InterfaceContract getBindingInterfaceContract() {
- return service.getInterfaceContract();
- }
-
- public void start() {
-
- RuntimeComponentService componentService = (RuntimeComponentService) service;
- RuntimeWire wire = componentService.getRuntimeWire(binding);
- InvocationChain chain = wire.getInvocationChains().get(0);
-
- // Register with the hosting server
- String uri = binding.getURI();
- EchoServer.getServer().register(uri, new EchoServiceListener(chain.getHeadInvoker(), messageFactory));
- }
-
- public void stop() {
-
- // Unregister from the hosting server
- String uri = component.getURI() + "/" + binding.getName();
- EchoServer.getServer().unregister(uri);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
deleted file mode 100644
index 33dc761aa4..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package echo.provider.policy;
-
-/**
- */
-public class EchoBindingEncryptionPolicy extends EchoBindingPolicy {
-
- private String encryptionStrategyClassName;
- private Class<? extends EncryptionStrategy> strategyClass;
-
- public String getEncryptionStrategyClassName() {
- return encryptionStrategyClassName;
- }
- public void setEncryptionStrategyClassName(String encryptionStrategyClassName) {
- this.encryptionStrategyClassName = encryptionStrategyClassName;
- }
- public Class<? extends EncryptionStrategy> getStrategyClass() {
- return strategyClass;
- }
- public void setStrategyClass(Class<? extends EncryptionStrategy> strategy) {
- this.strategyClass = strategy;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
deleted file mode 100644
index 49d195395b..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.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 echo.provider.policy;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-
-
-/**
- *
- */
-public class EchoBindingEncryptionPolicyProcessor extends EchoBindingPolicyProcessor<EchoBindingEncryptionPolicy> {
-
- public EchoBindingEncryptionPolicyProcessor(ModelFactoryExtensionPoint modelFactories) {
- }
-
- public Class<EchoBindingEncryptionPolicy> getModelType() {
- return EchoBindingEncryptionPolicy.class;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
deleted file mode 100644
index 7d38e3b7a8..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.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 echo.provider.policy;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
-
- */
-public class EchoBindingPolicy implements Policy {
- private boolean unresolved = true;
-
- public QName getSchemaName() {
- return new QName("http://sample/policy","echoBindingPolicy");
- }
-
- public boolean isUnresolved() {
- return unresolved;
- }
-
- public void setUnresolved(boolean unresolved) {
- this.unresolved = unresolved;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
deleted file mode 100644
index 72b8002238..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package echo.provider.policy;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-
-/**
- *
- */
-public abstract class EchoBindingPolicyProcessor<T extends EchoBindingPolicy> implements StAXArtifactProcessor<T> {
- public static final String ENCRYPTION = "Encryption";
-
- public QName getArtifactType() {
- return new QName("http://sample/policy", "echoBindingPolicy");
- }
-
- public T read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
- String name = reader.getAttributeValue(null, "name");
- if (name != null && name.equals(ENCRYPTION)) {
- EchoBindingEncryptionPolicy policy = new EchoBindingEncryptionPolicy();
- policy.setEncryptionStrategyClassName(reader.getAttributeValue(null, "strategy"));
- return (T)policy;
- }
- return null;
- }
-
- public void write(T arg0, XMLStreamWriter arg1) throws ContributionWriteException, XMLStreamException {
- }
-
- public void resolve(T policy, ModelResolver resolver) throws ContributionResolveException {
- if (policy instanceof EchoBindingEncryptionPolicy) {
- EchoBindingEncryptionPolicy ePolicy = (EchoBindingEncryptionPolicy)policy;
-
- ClassReference classReference = new ClassReference(ePolicy.getEncryptionStrategyClassName());
- classReference = resolver.resolveModel(ClassReference.class, classReference);
- Class javaClass = classReference != null ? classReference.getJavaClass() : null;
- if (javaClass == null) {
- //throw new ContributionResolveException(new ClassNotFoundException(ePolicy.getEncryptionStrategyClass()));
- }
- //ePolicy.setStrategyClass(javaClass);
- //FIXME: need to resolve this thro resolver
- try {
- ePolicy.setStrategyClass((Class<? extends EncryptionStrategy>)Class.forName(ePolicy
- .getEncryptionStrategyClassName()));
- } catch (Exception e) {
- throw new ContributionResolveException(e);
- }
- ePolicy.setStrategyClass(ePolicy.getStrategyClass());
- ePolicy.setUnresolved(false);
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
deleted file mode 100644
index deda8d9744..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.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 echo.provider.policy;
-
-import org.apache.tuscany.sca.policy.Policy;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Sample policy handler
- */
-public class EncryptionPolicyHandler implements PolicyHandler {
-
- public void applyPolicy(Object msg, PolicySet policySet) throws Exception {
- for ( Object aPolicy : policySet.getPolicies() ) {
- if ( aPolicy instanceof EchoBindingEncryptionPolicy ) {
- encrypt(msg, (EchoBindingEncryptionPolicy)aPolicy);
- }
- }
- }
-
- private void encrypt(Object msg, EchoBindingEncryptionPolicy policy) throws Exception {
- if ( !policy.isUnresolved() && msg instanceof Object[] ) {
- EncryptionStrategy strategy = policy.getStrategyClass().newInstance();
- Object[] msgArgs = (Object[])msg;
- for ( int count = 0 ; count < msgArgs.length ; ++count ) {
- msgArgs[count] = strategy.encryptMessage(msgArgs[count]);
- }
- }
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
deleted file mode 100644
index ffadfc7fff..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package echo.provider.policy;
-
-/**
-
- */
-public interface EncryptionStrategy {
- Object encryptMessage(Object msg);
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
deleted file mode 100644
index 6fa5f26977..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.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 echo.provider.policy;
-
-import org.apache.tuscany.sca.policy.PolicySet;
-
-/**
- * Sample Policy Handler Interface
- *
- */
-public interface PolicyHandler {
- void applyPolicy(Object msg, PolicySet policySet) throws Exception;
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
deleted file mode 100644
index cf55b36fc2..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.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 echo.provider.policy;
-
-/**
- */
-public class ReverseEncryptionStrategy implements EncryptionStrategy {
-
- public Object encryptMessage(Object msg) {
- if ( msg instanceof String ) {
- StringBuffer sb = new StringBuffer((String)msg);
- msg = sb.reverse().toString();
- }
- return msg;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
deleted file mode 100644
index ac610cfb51..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.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 echo.provider.policy;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
-
- */
-public class WSPolicy implements Policy {
- private boolean unresolved = true;
-
- public QName getSchemaName() {
- return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
- }
-
- public boolean isUnresolved() {
- return unresolved;
- }
-
- public void setUnresolved(boolean unresolved) {
- this.unresolved = unresolved;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
deleted file mode 100644
index 0ac113df07..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package echo.provider.policy;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.policy.Policy;
-
-/**
- * @author administrator
- *
- */
-public class WSPolicyProcessor implements StAXArtifactProcessor<WSPolicy> {
-
- public QName getArtifactType() {
- return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
- }
-
- public WSPolicy read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {
- return new WSPolicy();
- }
-
- public void write(WSPolicy arg0, XMLStreamWriter arg1) throws ContributionWriteException,
- XMLStreamException {
-
- }
-
- public Class<WSPolicy> getModelType() {
- // TODO Auto-generated method stub
- return WSPolicy.class;
- }
-
- public void resolve(WSPolicy arg0, ModelResolver arg1) throws ContributionResolveException {
-
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
deleted file mode 100644
index 8ea2395d04..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package echo.server;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A sample Echo server, showing how to integrate service bindings.
- */
-public class EchoServer {
-
- public static EchoServer server;
-
- private Map<String, EchoServiceListener> services = new HashMap<String, EchoServiceListener>();
-
- public static void start() {
- }
-
- public static void stop() {
- }
-
- public static EchoServer getServer() {
- if (server == null)
- server = new EchoServer();
- return server;
- }
-
- /**
- * Register a service under the given name.
- *
- * @param service
- * @param name
- */
- public void register(String uri, EchoServiceListener service) {
- if (services.isEmpty()) {
- start();
- }
- services.put(uri, service);
- }
-
- public void unregister(String uri) {
- services.remove(uri);
- if (services.isEmpty()) {
- stop();
- }
- }
-
- /**
- * Dispatch an incoming interaction to the corresponding service.
- *
- * @param uri
- * @param input
- * @return
- */
- public String sendReceive(String uri, String input) throws InvocationTargetException {
- return services.get(uri).sendReceive(input);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
deleted file mode 100644
index 32336dd94f..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.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 echo.server;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-
-public class EchoServiceListener {
- private Invoker invoker;
- private MessageFactory messageFactory;
-
- public EchoServiceListener(Invoker invoker, MessageFactory messageFactory) {
- super();
- this.invoker = invoker;
- this.messageFactory = messageFactory;
- }
-
- public String sendReceive(String input) throws InvocationTargetException {
-
- // Create a request message
- Message request = messageFactory.createMessage();
- request.setBody(new Object[] {input});
-
- // Dispatch and get the response
- Message response = invoker.invoke(request);
- Object body = response.getBody();
- if (response.isFault()) {
- throw new InvocationTargetException((Throwable)body);
- }
- return (String)body;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
deleted file mode 100644
index 55be293862..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the binding model factory
-echo.impl.EchoBindingFactoryImpl
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 06d53250c1..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://echo#binding.echo,model=echo.EchoBinding,factory=echo.EchoBindingFactory
-echo.provider.policy.EchoBindingEncryptionPolicyProcessor;qname=http://sample/policy#echoBindingPolicy,model=echo.provider.policy.EchoBindingEncryptionPolicy
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://schemas.xmlsoap.org/ws/2004/09/policy#PolicyAttachment,model=echo.provider.policy.WSPolicy
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index efa475ef92..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the binding provider extension
-echo.provider.EchoBindingProviderFactory;model=echo.EchoBinding
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/Echo.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/Echo.java
deleted file mode 100644
index 1d5e973f33..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/Echo.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 echo;
-
-/**
- * Interface of our sample Echo service.
- *
- * @version $Rev$ $Date$
- */
-public interface Echo {
-
- String echo(String msg);
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
deleted file mode 100644
index ba68dfe908..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.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 echo;
-
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Reference;
-
-
-/**
- * A simple client component that uses a reference with an Echo binding.
- *
- * @version $Rev$ $Date$
- */
-public class EchoComponentImpl implements Echo {
-
- private Echo echoReference;
-
- @Constructor
- public EchoComponentImpl(@Reference(name = "echoReference", required = true) Echo echoReference) {
- this.echoReference = echoReference;
- }
-
- public String echo(String msg) {
- String result = echoReference.echo(msg);
- System.out.println("Returned message: "+ result);
- return result;
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
deleted file mode 100644
index 7383077f18..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.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 echo;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoReferenceTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private Echo service;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("EchoBinding.composite");
- service = scaDomain.getService(Echo.class, "EchoComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void testEchoBinding() {
- String result = service.echo("foo");
- assertEquals(result, "oof");
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
deleted file mode 100644
index ab05516622..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.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 echo;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import echo.server.EchoServer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoServiceTestCase extends TestCase {
-
- private SCADomain scaDomain;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("EchoBinding.composite");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void testEchoBinding() throws Exception {
- String result = EchoServer.getServer().sendReceive("http://tempuri.org", "foo");
- assertEquals(result, "oof");
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
deleted file mode 100644
index ecb6063010..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample/echo"
- xmlns:se="http://sample/echo"
- xmlns:e="http://echo"
- xmlns:p="http://sample/policy"
- name="EchoBinding">
-
- <service name="EchoService" promote="EchoComponent">
- <interface.java interface="echo.Echo"/>
- <e:binding.echo uri="http://tempuri.org" />
- </service>
-
- <component name="EchoComponent">
- <implementation.java class="echo.EchoComponentImpl"/>
- </component>
-
- <reference name="EchoReference" promote="EchoComponent/echoReference">
- <interface.java interface="echo.Echo"/>
- <e:binding.echo uri="http://tempuri.org" policySets="p:EncryptionPolicy" />
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/definitions.xml b/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/definitions.xml
deleted file mode 100644
index a742804fb8..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<sca:definitions xmlns="http://test"
- targetNamespace="http://test"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
- <!-- qualified intents -->
- <sca:intent name="confidentiality.transport" />
- <sca:intent name="confidentiality.message" />
- <sca:intent name="confidentiality.message.whole" />
- <sca:intent name="confidentiality.message.body" />
-
- <!-- POLICY SETS -->
- <sca:policySet name="p:EncryptionPolicy"
- provides="confidentiality"
- appliesTo="sca:binding.echo"
- xmlns="http://test"
- xmlns:p="http://sample/policy">
- <p:echoBindingPolicy name="Encryption" strategy="echo.provider.policy.ReverseEncryptionStrategy" />
- </sca:policySet>
-
- <sca:policySet name="SecureReliablePolicy"
- provides="confidentiality.transport integrity"
- appliesTo="sca:binding.ws"
- xmlns="http://test"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for
- "basic authentication" -->
- </wsp:PolicyAttachment>
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for
- "reliability" -->
- </wsp:PolicyAttachment>
- </sca:policySet>
-
- <sca:policySet name="SecureReliablePolicy"
- provides="confidentiality.transport integrity"
- appliesTo="sca:binding.ws"
- xmlns="http://test"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for
- "basic authentication" -->
- </wsp:PolicyAttachment>
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for
- "reliability" -->
- </wsp:PolicyAttachment>
- </sca:policySet>
-
- <sca:policySet name="SecureMessagingPolicies"
- provides="confidentiality"
- appliesTo="binding.ws"
- xmlns="http://test"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <sca:intentMap provides="confidentiality" default="transport">
- <sca:qualifier name="transport">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for "transport" alternative -->
- </wsp:PolicyAttachment>
- <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
- </sca:qualifier>
- <sca:qualifier name="message">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for "message" alternative" -->
- </wsp:PolicyAttachment>
- </sca:qualifier>
- </sca:intentMap>
-</sca:policySet>
-
-<sca:policySet name="SecurityPolicy" provides="confidentiality"
- xmlns="http://test"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
- <sca:intentMap provides="confidentiality" default="message">
- <sca:qualifier name="message">
- <sca:intentMap provides="message" default="whole">
- <sca:qualifier name="body">
- <wsp:PolicyAttachment>
- <!-- policy attachment for body encryption -->
- </wsp:PolicyAttachment>
- </sca:qualifier>
- <sca:qualifier name="whole">
- <wsp:PolicyAttachment>
- <!-- policy attachment for whole message encryption -->
- </wsp:PolicyAttachment>
- </sca:qualifier>
- </sca:intentMap>
- </sca:qualifier>
- <sca:qualifier name="transport">
- <wsp:PolicyAttachment>
- <!-- policy attachment for transport encryption -->
- </wsp:PolicyAttachment>
- </sca:qualifier>
- </sca:intentMap>
-</sca:policySet>
-
-<sca:policySet name="BasicAuthMsgProtSecurity"
- provides="authentication confidentiality"
- appliesTo="binding.ws"
- xmlns="http://test">
- <sca:policySetReference name="AuthenticationPolicies"/>
- <sca:policySetReference name="ConfidentialityPolicies"/>
-</sca:policySet>
-
-<sca:policySet name="AuthenticationPolicies"
- provides="authentication"
- appliesTo="binding.ws"
- xmlns="http://test"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for "basic
- authentication" -->
- </wsp:PolicyAttachment>
-</sca:policySet>
-
-<sca:policySet name="ConfidentialityPolicies"
- provides="confidentiality"
- bindings="binding.ws"
- xmlns="http://test"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <sca:intentMap provides="confidentiality" default="transport">
- <sca:qualifier name="transport">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for "transport"
- alternative -->
- </wsp:PolicyAttachment>
- <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
- </sca:qualifier>
- <sca:qualifier name="message">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for "message"
- alternative" -->...
- </wsp:PolicyAttachment>
- </sca:qualifier>
- </sca:intentMap>
-</sca:policySet>
-
-<!-- profile intent -->
- <sca:intent name="reliableMessageProtection"
- constrains="sca:binding"
- requires="messageProtection">
- <sca:description>
- Protect messages from unauthorized reading or modification
- </sca:description>
- </sca:intent>
-
- <sca:intent name="messageProtection"
- constrains="sca:binding"
- requires="confidentiality integrity">
- <sca:description>
- Protect messages from unauthorized reading or modification
- </sca:description>
- </sca:intent>
-
-<!-- simple intent -->
- <sca:intent name="confidentiality"
- constrains="sca:binding">
- <sca:description>
- Communitcation thro this binding must prevent
- unauthorized users from reading the messages.
- </sca:description>
- </sca:intent>
-
- <sca:intent name="integrity"
- constrains="sca:binding">
- <sca:description>
- Communitcation thro this binding must prevent
- unauthorized modification of the messages.
- </sca:description>
- </sca:intent>
-
- <sca:intent name="authentication"
- constrains="sca:binding">
- <sca:description>
- Communitcation thro this binding required
- Authentication.
- </sca:description>
- </sca:intent>
-
-</sca:definitions> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/binding-echo/README b/branches/sca-java-0.99/samples/binding-echo/README
deleted file mode 100644
index 0aea36a081..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo/README
+++ /dev/null
@@ -1,99 +0,0 @@
-Binding Echo Sample Application
-===============================
-This sample demonstrates how to use the new binding extension
-binding-echo-extension.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens, open a command prompt,
-navigate to this sample directory, and do
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;..\binding-echo-extension\target\sample-binding-echo-extension.jar;target\sample-binding-echo.jar echo.EchoBindingClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:../binding-echo-extension/target/sample-binding-echo-extension.jar:target/sample-binding-echo.jar echo.EchoBindingClient
-
-This looks like a long command. The three things we add to the classpath are
-
-tuscany-sca-manifest.jar - all of the standard Tuscany SCA runtime and
- extension classes
-sample-binding-echo-extension.jar - the new echo binding extension implementation
-sample-binding-echo - the application that uses the echo binding
-
-
-Sample Overview
----------------
-This sample contains an application (client and server code) that uses
-an SCA binding that simply echoes back any messages that are sent to it.
-
-binding-echo/
- src/
- main/
- java/
- echo/
- Echo.java - interface definition for the sample
- reference and service
- EchoComponentImpl.java - sample component implementation with
- echo binding reference
- EchoBindingClient.java - sample client
- resources/
- EchoBinding.composite - the SCA assembly for this sample
- test/
- java/
- echo
- EchoBindingTestCase.java - sample JUnit test case for the sample
- client
- binding-echo.png - pictorial representation of the sample
- .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows.
-
-cd binding-echo
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Returned message: foo
- [java] Echo reference = foo
- [java] Returned message: bar
- [java] Echo service = bar
-
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and
-run using Maven as follows.
-
-cd binding-echo
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running echo.EchoBindingTestCase
-Returned message: foo
-Returned message: bar
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.811 sec
-
-Results :
-
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/binding-echo/binding-echo.png b/branches/sca-java-0.99/samples/binding-echo/binding-echo.png
deleted file mode 100644
index a38d985363..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo/binding-echo.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/binding-echo/binding-echo.svg b/branches/sca-java-0.99/samples/binding-echo/binding-echo.svg
deleted file mode 100644
index 5b5051bef5..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo/binding-echo.svg
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\binding-echo"
- sodipodi:docname="binding-echo.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\binding-echo\binding-echo.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="528.85714"
- inkscape:cy="406.01174"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1142"
- inkscape:window-height="722"
- inkscape:window-x="58"
- inkscape:window-y="135" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(1.038749,0,0,1.009461,-29.25616,-1.807024)">
- <rect
- rx="8.7034655"
- ry="12.692303"
- y="192.00233"
- x="375.89822"
- height="299.99988"
- width="281.85843"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.95312572;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"
- transform="translate(104.5213,-10.61387)"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">EchoBinding</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 397.85714,346.95163 L 440,346.95163"
- id="path1896"
- transform="matrix(0.962696,0,0,0.990628,28.1648,1.790088)" />
- </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="450.63062"
- y="302.8819"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(183.0398,96.94336)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">EchoComponent</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 433.4801,334.72889 L 466.81514,334.72889 L 472.87605,347.86087 L 465.80499,359.98271 L 433.4801,359.98271 L 441.05625,347.86087 L 433.4801,334.72889 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 546.73254,332.89061 L 580.06758,332.89061 L 586.12849,346.02259 L 579.05743,358.14443 L 546.73254,358.14443 L 554.30869,346.02259 L 546.73254,332.89061 z "
- id="path3019" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 328.15933,319.32471 L 387.4834,319.32471 L 398.26959,346.57097 L 385.68571,371.72138 L 328.15933,371.72138 L 341.64208,346.57097 L 328.15933,319.32471 z "
- id="path1883" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 610.30199,319.1819 L 674.46121,319.1819 L 686.12651,346.05674 L 672.517,370.8643 L 610.30199,370.8643 L 624.88364,346.05674 L 610.30199,319.1819 z "
- id="path1885" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1887"
- transform="translate(62.97619,122.4038)"><flowRegion
- id="flowRegion1889"><rect
- id="rect1891"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1893"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:12;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%">Echo</flowPara><flowPara
- id="flowPara1895"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:12;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%">Serivce</flowPara></flowRoot> <text
- xml:space="preserve"
- style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
- x="625.14288"
- y="343.23737"
- id="text1897"
- sodipodi:linespacing="100%"><tspan
- sodipodi:role="line"
- id="tspan1899"
- x="625.14288"
- y="343.23737"
- style="font-family:Arial;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:12;text-anchor:start;text-align:start;writing-mode:lr;line-height:100%">Echo</tspan><tspan
- sodipodi:role="line"
- x="625.14288"
- y="355.23737"
- id="tspan1901"
- style="font-family:Arial;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:12;text-anchor:start;text-align:start;writing-mode:lr;line-height:100%">Reference</tspan></text>
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 585.71429,345.52305 C 624.28571,345.52305 624.28571,345.52305 624.28571,345.52305"
- id="path1898" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/binding-echo/build.xml b/branches/sca-java-0.99/samples/binding-echo/build.xml
deleted file mode 100644
index 7689ef3a54..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo/build.xml
+++ /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.
--->
-<project name="binding-echo" default="compile">
- <property name="test.class" value="echo.EchoBindingClient" />
- <property name="test.jar" value="sample-binding-echo.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement location="target/${test.jar}"/>
- <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/binding-echo/pom.xml b/branches/sca-java-0.99/samples/binding-echo/pom.xml
deleted file mode 100644
index ed85cf6c47..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-echo</artifactId>
- <name>Apache Tuscany Echo Binding Sample Application</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sample-binding-echo-extension</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/Echo.java b/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/Echo.java
deleted file mode 100644
index 1d5e973f33..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/Echo.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 echo;
-
-/**
- * Interface of our sample Echo service.
- *
- * @version $Rev$ $Date$
- */
-public interface Echo {
-
- String echo(String msg);
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
deleted file mode 100644
index 21bdff4011..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoBindingClient.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 echo;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import echo.server.EchoServer;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- * @version $Rev$ $Date$
- */
-public class EchoBindingClient {
-
- public static void main(String[] args) throws Exception {
-
- SCADomain scaDomain = SCADomain.newInstance("EchoBinding.composite");
-
- // Call the echo service component which will, in turn, call a reference
- // with an echo binding. The echo binding will echo the given string.
- Echo service = scaDomain.getService(Echo.class, "EchoComponent");
- String echoString = service.echo("foo");
- System.out.println("Echo reference = " + echoString );
-
- // Call the echo server. This will dispatch the call to a service with an
- // echo binding. The echo binding will pass the call to the echo component.
- echoString = EchoServer.getServer().sendReceive("http://tempuri.org", "bar");
- System.out.println("Echo service = " + echoString );
-
- scaDomain.close();
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
deleted file mode 100644
index ba68dfe908..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo/src/main/java/echo/EchoComponentImpl.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 echo;
-
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Reference;
-
-
-/**
- * A simple client component that uses a reference with an Echo binding.
- *
- * @version $Rev$ $Date$
- */
-public class EchoComponentImpl implements Echo {
-
- private Echo echoReference;
-
- @Constructor
- public EchoComponentImpl(@Reference(name = "echoReference", required = true) Echo echoReference) {
- this.echoReference = echoReference;
- }
-
- public String echo(String msg) {
- String result = echoReference.echo(msg);
- System.out.println("Returned message: "+ result);
- return result;
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-echo/src/main/resources/EchoBinding.composite b/branches/sca-java-0.99/samples/binding-echo/src/main/resources/EchoBinding.composite
deleted file mode 100644
index 94612fb325..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample/echo"
- xmlns:se="http://sample/echo"
- xmlns:e="http://echo"
- name="EchoBinding">
-
- <service name="EchoService" promote="EchoComponent">
- <interface.java interface="echo.Echo"/>
- <e:binding.echo uri="http://tempuri.org" />
- </service>
-
- <component name="EchoComponent">
- <implementation.java class="echo.EchoComponentImpl"/>
- </component>
-
- <reference name="EchoReference" promote="EchoComponent/echoReference">
- <interface.java interface="echo.Echo"/>
- <e:binding.echo uri="http://tempuri.org" />
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/branches/sca-java-0.99/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
deleted file mode 100644
index 1a597fc80f..0000000000
--- a/branches/sca-java-0.99/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package echo;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import echo.Echo;
-import echo.server.EchoServer;
-
-public class EchoBindingTestCase extends TestCase {
-
- private SCADomain scaDomain;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("EchoBinding.composite");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void testReference() throws Exception {
- // Call the echo service component which will, in turn, call a reference
- // with an echo binding. The echo binding will echo the given string.
- Echo service = scaDomain.getService(Echo.class, "EchoComponent");
- String echoString = service.echo("foo");
- assertEquals(echoString, "foo");
- }
-
- public void testService() throws Exception {
- // Call the echo server. This will dispatch the call to a service with an
- // echo binding. The echo binding will pass the call to the echo component.
- String echoString = EchoServer.getServer().sendReceive("http://tempuri.org", "bar");
- assertEquals(echoString, "bar");
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/README b/branches/sca-java-0.99/samples/binding-notification-broker/README
deleted file mode 100644
index eb3322cf9b..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/README
+++ /dev/null
@@ -1,95 +0,0 @@
-Notification Broker Binding Sample
-==================================
-
-This sample illustrates the use of <binding.notification/> with a
-broker.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-Sample Overview
----------------
-
-This sample illustrates the use of a notification broker that is located in a
-separate (and remote) composite with respect to any producers or consumers. As
-such, this sample is run in conjunction with the binding-notification-producer
-sample, the binding-notification-consumer sample, or both. Take a look at the
-composite file or the .svg file which shows the composite file in pictorial form.
-The composite service and composite reference each have a <binding.notification/>
-that handles the remote communication. This binding includes an 'ntm' attribute
-that refers to the notification type manager, which manages the connectivity of
-producers, consumers and brokers, and which (for this sample) is assumed to be
-running on http://localhost:8083. The ntm is a system component that is included in
-and runs as part of the binding-notification module.
-This sample also illustrates the use of a wsdl interface in the notification
-component's <implementation.notification/>. This allows messages sent and received
-via <binding.notification/> to be transported as literal xml over http.
-
-Building And Running The Sample Using Maven
--------------------------------------------
-
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd binding-notification-broker
-mvn
-
-Sample Usage
-------------
-
-This sample is run using the tuscany binary distribution. To run it, first set the
-following environment variables:
-
-set MAVEN_REPO=<Directory where your maven repo resides, e.g. \Documents and Settings\Administrator\.m2\repository>
-set NOTIFICATION_IMPL_JAR=%MAVEN_REPO%\org\apache\tuscany\sca\tuscany-implementation-notification\1.0-incubating-SNAPSHOT\tuscany-implementation-notification-1.0-incubating-SNAPSHOT.jar
-set NOTIFICATION_BINDING_JAR=%MAVEN_REPO%\org\apache\tuscany\sca\tuscany-binding-notification\1.0-incubating-SNAPSHOT\tuscany-binding-notification-1.0-incubating-SNAPSHOT.jar
-set STAX_JAR=%MAVEN_REPO%\stax\stax\1.1.1-dev\stax-1.1.1-dev.jar
-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca-1.0-incubating-SNAPSHOT>
-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar
-
-Then navigate to this sample directory and do:
-
-java -Dnotification.httpPort=8080 -cp "target\sample-binding-notification-broker-1.0-incubating-SNAPSHOT.jar;%NOTIFICATION_IMPL_JAR%;%NOTIFICATION_BINDING_JAR%;%STAX_JAR%;%TUSCANY_SCA_MANIFEST_JAR%" notification.broker.TrafficAdvisoryServer
-
-this should bring up the following prompt:
-
-Send a report value, ^C or <end> to end
-
-at this point you should be able to type a message to send, for instance:
-
-Traffic congestion
-
-Notice that before you try to receive any message, you should bring up the
-consumer sample or another broker sample. When you have finished using this
-sample, type 'end' or ^C to end.
-
-Also notice that '-Dnotification.httpPort=8080' is used in the java command.
-This indicates the port the sample should use. This also says that this server
-is not going to play the role of ntm, given our previous assumption. It is important
-that the first one of the producer, consumer or broker sample that is run be the
-one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk
-to and an exception will be thrown.
-
-Sample directory structure:
----------------------------
-
-binding-notification-broker/
- src/
- main/
- java/
- notification.broker/
- TestCaseProducer.java - interface for the producer component
- TrafficAdvisory.java - remote interface referred to by the producer component
- and for the consumer component
- TrafficAdvisoryConsumer.java - implementation for the consumer components
- TrafficAdvisoryProducer.java - implementation for the producer component
- TrafficAdvisoryServer.java - server class including main entry point
- resources/
- wsdl/
- TrafficAdvisory.wsdl - remote interface for the notification component
- TrafficAdvisoryNotification.componentType - the component type referred to by
- <implementation.notification/>
- TrafficAdvisoryNotification.composite - the main composite including producer, consumer and
- notification components, and composite service and reference
- pom.xml - the Maven build file
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/binding-notification-broker.png b/branches/sca-java-0.99/samples/binding-notification-broker/binding-notification-broker.png
deleted file mode 100644
index 49030650f2..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/binding-notification-broker.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/pom.xml b/branches/sca-java-0.99/samples/binding-notification-broker/pom.xml
deleted file mode 100644
index d002219743..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-notification-broker</artifactId>
- <name>Apache Tuscany Notification Binding Broker Sample</name>
- <version>0.99-incubating-SNAPSHOT</version>
- <description>A sample illustrating use of binding.notification</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-notification</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-notification</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- <defaultGoal>install</defaultGoal>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
deleted file mode 100644
index 35fa1a9ee9..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package notification.broker;
-
-public interface TestCaseProducer {
-
- public void produceTrafficNotification(String report);
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
deleted file mode 100644
index d5bc8fbb50..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.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 notification.broker;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TrafficAdvisory {
-
- void trafficNotification(String report);
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
deleted file mode 100644
index a89fa8a913..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package notification.broker;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(TrafficAdvisory.class)
-@Scope("COMPOSITE")
-public class TrafficAdvisoryConsumer implements TrafficAdvisory {
-
- @Property
- protected String name;
-
- public void trafficNotification(String report) {
-
- System.out.println("Consumer [" + name + "] received report: " + report);
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
deleted file mode 100644
index 8caefaf1d2..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.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 notification.broker;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(TestCaseProducer.class)
-@Scope("COMPOSITE")
-public class TrafficAdvisoryProducer implements TestCaseProducer {
-
- @Reference
- protected TrafficAdvisory destination;
-
- public void produceTrafficNotification(String report) {
-
- destination.trafficNotification(report);
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
deleted file mode 100644
index 430e9d6db7..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package notification.broker;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URI;
-
-import org.apache.tuscany.sca.binding.notification.NotificationBindingProviderFactory;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TrafficAdvisoryServer {
-
- private static URI notificationType;
-
- public static void main(String[] args) {
- try {
- notificationType = new URI("trafficAdvisory");
- String compositeName = "TrafficAdvisoryNotification.composite";
- SCADomain domain = SCADomain.newInstance(compositeName);
- TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
-
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- String value = null;
- do {
- try {
- System.out.println("Send a report value, ^C or <end> to end");
- value = reader.readLine();
- } catch (IOException e) {
- e.printStackTrace();
- }
- if(value == null || value.equals("end")) {
- break;
- }
- if (value.equals("rb")) {
- NotificationBindingProviderFactory.removeBroker(notificationType);
- }
- else {
- testCaseProducer.produceTrafficNotification("Report value [" + value + "]");
- }
- }
- while(true);
-
- domain.close();
- } catch(Throwable e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 031f6aafd0..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
- <service name="TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- </service>
-
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- </reference>
-</componentType>
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index 1a369d880d..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="TrafficAdvisoryNotificationBrokerComposite">
-
- <service name="TrafficAdvisoryNotificationCompositeService"
- promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>
- </service>
-
- <component name="TrafficAdvisoryProducer">
- <implementation.java class="notification.broker.TrafficAdvisoryProducer"/>
- <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>
- </component>
-
- <component name="TrafficAdvisoryNotificationComponent">
- <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>
- <!-- Never use > 1 reference elements here !! -->
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n"
- target="TrafficAdvisoryConsumer1"/>
- </component>
-
- <component name="TrafficAdvisoryConsumer1">
- <implementation.java class="notification.broker.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer1</property>
- </component>
-
- <reference name="TrafficAdvisoryNotificationCompositeReference"
- promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationReference">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<definitions name="TrafficAdvisory"
- targetNamespace="http://example.com/TrafficAdvisory.wsdl"
- xmlns:tns="http://example.com/TrafficAdvisory.wsdl"
- xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
- <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"
- xmlns:tns="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="trafficNotification">
- <complexType>
- <sequence>
- <element name="report" type="string" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </types>
-
- <message name="TrafficNotificationInput">
- <part name="body" element="xsd1:trafficNotification" />
- </message>
-
- <portType name="TrafficAdvisoryPortType">
- <operation name="trafficNotification">
- <input message="tns:TrafficNotificationInput" />
- </operation>
- </portType>
-
-</definitions>
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/README b/branches/sca-java-0.99/samples/binding-notification-consumer/README
deleted file mode 100644
index 00340765e2..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/README
+++ /dev/null
@@ -1,89 +0,0 @@
-Notification Consumer Binding Sample
-===============================
-
-This sample illustrates the use of <binding.notification/> with a
-remote consumer.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-Sample Overview
----------------
-
-This sample illustrates the use of a notification consumer that is located in a
-separate (and remote) composite with respect to any producers. As such, this sample
-is run in conjunction with the binding-notification-producer sample, the
-binding-notification-broker sample, or both. Take a look at the composite file
-or the .svg file which shows the composite file in pictorial form. The composite
-service, wired to the notification component, has a <binding.notification/>
-that handles the remote communication. This binding includes an 'ntm' attribute
-that refers to the notification type manager, which manages the connectivity of
-producers, consumers and brokers, and which (for this sample) is assumed to be
-running on http://localhost:8083. The ntm is a system component that is included in
-and runs as part of the binding-notification module.
-This sample also illustrates the use of a wsdl interface in the notification
-component's <implementation.notification/>. This allows messages sent and received
-via <binding.notification/> to be transported as literal xml over http.
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd binding-notification-consumer
-mvn
-
-Sample Usage
-------------
-
-This sample is run using the tuscany binary distribution. To run it, first set the
-following environment variables:
-
-set MAVEN_REPO=<Directory where your maven repo resides, e.g. \Documents and Settings\Administrator\.m2\repository>
-set NOTIFICATION_IMPL_JAR=%MAVEN_REPO%\org\apache\tuscany\sca\tuscany-implementation-notification\1.0-incubating-SNAPSHOT\tuscany-implementation-notification-1.0-incubating-SNAPSHOT.jar
-set NOTIFICATION_BINDING_JAR=%MAVEN_REPO%\org\apache\tuscany\sca\tuscany-binding-notification\1.0-incubating-SNAPSHOT\tuscany-binding-notification-1.0-incubating-SNAPSHOT.jar
-set STAX_JAR=%MAVEN_REPO%\stax\stax\1.1.1-dev\stax-1.1.1-dev.jar
-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca-1.0-incubating-SNAPSHOT>
-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar
-
-Then navigate to this sample directory and do:
-
-java -Dnotification.httpPort=8082 -cp "target\sample-binding-notification-consumer-1.0-incubating-SNAPSHOT.jar;%NOTIFICATION_IMPL_JAR%;%NOTIFICATION_BINDING_JAR%;%STAX_JAR%;%TUSCANY_SCA_MANIFEST_JAR%" notification.consumer.TrafficAdvisoryServer
-
-this should bring up the following prompt:
-
-TrafficAdvisoryServer, hit return to end
-
-at this point you should be able to receive messages.
-
-Notice that before you try to receive any message, you should bring up the
-producer sample or the broker sample. When you have finished using this
-sample, hit return to end.
-
-Also notice that '-Dnotification.httpPort=8082' is used in the java command.
-This indicates the port the sample should use. This also says that this server
-is not going to play the role of ntm, given our previous assumption. It is important
-that the first one of the producer, consumer or broker sample that is run be the
-one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk
-to and an exception will be thrown.
-
-Sample directory structure:
----------------------------
-
-binding-notification-consumer/
- src/
- main/
- java/
- notification.consumer/
- TrafficAdvisory.java - remote interface referred to by the producer component
- TrafficAdvisoryConsumer.java - implementation for the consumer components
- TrafficAdvisoryServer.java - server class including main entry point
- resources/
- wsdl/
- TrafficAdvisory.wsdl - remote interface for the notification component
- TrafficAdvisoryNotification.componentType - the component type referred to by
- <implementation.notification/>
- TrafficAdvisoryNotification.composite - the main composite including producer and
- notification components, and composite reference
- pom.xml - the Maven build file
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/binding-notification-consumer.png b/branches/sca-java-0.99/samples/binding-notification-consumer/binding-notification-consumer.png
deleted file mode 100644
index 33e1966c3e..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/binding-notification-consumer.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/pom.xml b/branches/sca-java-0.99/samples/binding-notification-consumer/pom.xml
deleted file mode 100644
index 677c96e5e1..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/pom.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-notification-consumer</artifactId>
- <name>Apache Tuscany Notification Binding Consumer Sample</name>
- <version>0.99-incubating-SNAPSHOT</version>
- <description>A sample illustrating use of binding.notification</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-notification</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-notification</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-java-xml</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-wsdl-xml</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- <defaultGoal>install</defaultGoal>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
deleted file mode 100644
index 0efd1195bc..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.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 notification.consumer;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TrafficAdvisory {
-
- void trafficNotification(String report);
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
deleted file mode 100644
index 6b88389d0c..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package notification.consumer;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(TrafficAdvisory.class)
-@Scope("COMPOSITE")
-public class TrafficAdvisoryConsumer implements TrafficAdvisory {
-
- @Property
- protected String name;
-
- public void trafficNotification(String report) {
-
- System.out.println("Consumer [" + name + "] received report: " + report);
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
deleted file mode 100644
index 0f4e037df9..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.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 notification.consumer;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TrafficAdvisoryServer {
-
- public static void main(String[] args) {
- try {
- SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
-
- try {
- System.out.println("TrafficAdvisoryServer, hit return to end");
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- domain.close();
- } catch(Throwable e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 031f6aafd0..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
- <service name="TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- </service>
-
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- </reference>
-</componentType>
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index e6ef9ee09a..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="TrafficAdvisoryNotificationRemoteConsumerComposite">
-
- <service name="TrafficAdvisoryNotificationCompositeService"
- promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="http://example.com/trafficAdvisory"/>
- </service>
-
- <component name="TrafficAdvisoryNotificationComponent">
- <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>
- <!-- Never use > 1 reference elements here !! -->
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n"
- target="TrafficAdvisoryConsumer1 TrafficAdvisoryConsumer2"/>
- </component>
-
- <component name="TrafficAdvisoryConsumer1">
- <implementation.java class="notification.consumer.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer1</property>
- </component>
-
- <component name="TrafficAdvisoryConsumer2">
- <implementation.java class="notification.consumer.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer2</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<definitions name="TrafficAdvisory"
- targetNamespace="http://example.com/TrafficAdvisory.wsdl"
- xmlns:tns="http://example.com/TrafficAdvisory.wsdl"
- xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
- <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"
- xmlns:tns="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="trafficNotification">
- <complexType>
- <sequence>
- <element name="report" type="string" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </types>
-
- <message name="TrafficNotificationInput">
- <part name="body" element="xsd1:trafficNotification" />
- </message>
-
- <portType name="TrafficAdvisoryPortType">
- <operation name="trafficNotification">
- <input message="tns:TrafficNotificationInput" />
- </operation>
- </portType>
-
-</definitions>
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/README b/branches/sca-java-0.99/samples/binding-notification-producer/README
deleted file mode 100644
index 6fb124bf9b..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/README
+++ /dev/null
@@ -1,118 +0,0 @@
-Notification Producer Binding Sample
-===============================
-
-This sample illustrates the use of <binding.notification/> with a
-remote producer.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-Sample Overview
----------------
-
-This sample illustrates the use of a notification producer that is located in a
-separate (and remote) composite with respect to any consumers. As such, this sample
-is run in conjunction with the binding-notification-consumer sample, the
-binding-notification-broker sample, or both. Take a look at the composite file
-or the .svg file which shows the composite file in pictorial form. The composite
-reference, referred to by the notification component, has a <binding.notification/>
-that handles the remote communication. This binding includes an 'ntm' attribute
-that refers to the notification type manager, which manages the connectivity of
-producers, consumers and brokers, and which (for this sample) is assumed to be
-running on http://localhost:8083. The ntm is a system component that is included in
-and runs as part of the binding-notification module.
-This sample also illustrates the use of a wsdl interface in the notification
-component's <implementation.notification/>. This allows messages sent and received
-via <binding.notification/> to be transported as literal xml over http.
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd binding-notification-producer
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running notification.producer.TrafficAdvisoryTestCase
-Only instantiating and closing domain ...
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.252 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
-
-Sample Usage
-------------
-
-This sample is run using the tuscany binary distribution. To run it, first set the
-following environment variables:
-
-set MAVEN_REPO=<Directory where your maven repo resides, e.g. \Documents and Settings\Administrator\.m2\repository>
-set NOTIFICATION_IMPL_JAR=%MAVEN_REPO%\org\apache\tuscany\sca\tuscany-implementation-notification\1.0-incubating-SNAPSHOT\tuscany-implementation-notification-1.0-incubating-SNAPSHOT.jar
-set NOTIFICATION_BINDING_JAR=%MAVEN_REPO%\org\apache\tuscany\sca\tuscany-binding-notification\1.0-incubating-SNAPSHOT\tuscany-binding-notification-1.0-incubating-SNAPSHOT.jar
-set STAX_JAR=%MAVEN_REPO%\stax\stax\1.1.1-dev\stax-1.1.1-dev.jar
-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca-1.0-incubating-SNAPSHOT>
-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar
-
-Then navigate to this sample directory and do:
-
-java -Dnotification.httpPort=8083 -cp "target\sample-binding-notification-producer-1.0-incubating-SNAPSHOT.jar;%NOTIFICATION_IMPL_JAR%;%NOTIFICATION_BINDING_JAR%;%STAX_JAR%;%TUSCANY_SCA_MANIFEST_JAR%" notification.producer.TrafficAdvisoryServer
-
-this should bring up the following prompt:
-
-Send a report value, ^C or <end> to end
-
-at this point you should be able to type a message to send, for instance:
-
-Traffic congestion
-
-Notice that before you try to send any message, you should bring up the
-consumer sample or the broker sample. When you have finished using this
-sample, type 'end' or ^C to end.
-
-Also notice that '-Dnotification.httpPort=8083' is used in the java command.
-This indicates the port the sample should use. This also says that this server
-is going to play the role of ntm, given our previous assumption. It is important
-that the first one of the producer, consumer or broker sample that is run be the
-one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk
-to and an exception will be thrown.
-
-Sample directory structure:
----------------------------
-
-binding-notification-producer/
- src/
- main/
- java/
- notification.producer/
- TestCaseProducer.java - interface for the producer component
- TrafficAdvisory.java - remote interface referred to by the producer component
- TrafficAdvisoryProducer.java - implementation for the producer component
- TrafficAdvisoryServer.java - server class including main entry point
- resources/
- wsdl/
- TrafficAdvisory.wsdl - remote interface for the notification component
- TrafficAdvisoryNotification.componentType - the component type referred to by
- <implementation.notification/>
- TrafficAdvisoryNotification.composite - the main composite including producer and
- notification components, and composite reference
- test/
- java/
- notification.producer/
- TrafficAdvisoryTestCase.java - JUnit test case
- resources/
- wsdl/
- TrafficAdvisory.wsdl - remote interface for the notification component
- TrafficAdvisoryNotification.componentType - the component type referred to by
- <implementation.notification/>
- TrafficAdvisoryNotification.composite - the main composite including producer and
- notification components, and composite reference
- pom.xml - the Maven build file
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/binding-notification-producer.png b/branches/sca-java-0.99/samples/binding-notification-producer/binding-notification-producer.png
deleted file mode 100644
index 34c347c893..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/binding-notification-producer.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/pom.xml b/branches/sca-java-0.99/samples/binding-notification-producer/pom.xml
deleted file mode 100644
index b172f56305..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/pom.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-notification-producer</artifactId>
- <name>Apache Tuscany Notification Binding Producer Sample</name>
- <version>0.99-incubating-SNAPSHOT</version>
- <description>A sample illustrating use of binding.notification</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-notification</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-notification</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-wsdl-xml</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.tuscany.notification.remoteProducer.TrafficAdvisoryServer</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- <defaultGoal>install</defaultGoal>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
deleted file mode 100644
index be80e71249..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package notification.producer;
-
-public interface TestCaseProducer {
-
- public void produceTrafficNotification(String report);
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
deleted file mode 100644
index 39f06d5dde..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.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 notification.producer;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TrafficAdvisory {
-
- void trafficNotification(String report);
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
deleted file mode 100644
index 7d49b00607..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.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 notification.producer;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(TestCaseProducer.class)
-@Scope("COMPOSITE")
-public class TrafficAdvisoryProducer implements TestCaseProducer {
-
- @Reference
- protected TrafficAdvisory destination;
-
- public void produceTrafficNotification(String report) {
-
- destination.trafficNotification(report);
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
deleted file mode 100644
index 235b180be8..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.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 notification.producer;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class TrafficAdvisoryServer {
-
- public static void main(String[] args) {
- try {
- SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
- TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- String value = null;
- do {
- try {
- System.out.println("Send a report value, ^C or <end> to end");
- value = reader.readLine();
- } catch (IOException e) {
- e.printStackTrace();
- }
- if(value == null || value.equals("end")) {
- break;
- }
- testCaseProducer.produceTrafficNotification("Report value [" + value + "]");
- }
- while(true);
-
- domain.close();
- } catch(Throwable e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 031f6aafd0..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
- <service name="TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- </service>
-
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- </reference>
-</componentType>
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index 3f8436cb24..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="TrafficAdvisoryNotificationRemoteProducerComposite">
-
- <component name="TrafficAdvisoryProducer">
- <implementation.java class="notification.producer.TrafficAdvisoryProducer"/>
- <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>
- </component>
-
- <component name="TrafficAdvisoryNotificationComponent">
- <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>
- </component>
-
- <reference name="TrafficAdvisoryNotificationCompositeReference"
- promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationReference">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<definitions name="TrafficAdvisory"
- targetNamespace="http://example.com/TrafficAdvisory.wsdl"
- xmlns:tns="http://example.com/TrafficAdvisory.wsdl"
- xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
- <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"
- xmlns:tns="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="trafficNotification">
- <complexType>
- <sequence>
- <element name="report" type="string" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </types>
-
- <message name="TrafficNotificationInput">
- <part name="body" element="xsd1:trafficNotification" />
- </message>
-
- <portType name="TrafficAdvisoryPortType">
- <operation name="trafficNotification">
- <input message="tns:TrafficNotificationInput" />
- </operation>
- </portType>
-
-</definitions>
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/branches/sca-java-0.99/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
deleted file mode 100644
index e01175cfeb..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package notification.producer;
-
-import notification.producer.TestCaseProducer;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-//import org.apache.tuscany.sca.notification.remoteProducer.TestCaseProducer;
-
-import junit.framework.TestCase;
-
-public class TrafficAdvisoryTestCase extends TestCase {
-
- private SCADomain domain;
-
- public void testTrafficAdvisoryNotification() throws Exception {
- System.out.println("Only instantiating and closing domain ...");
- }
-
- @Override
- protected void setUp() throws Exception {
- try {
- domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
- domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
- } catch(Throwable e) {
- e.printStackTrace();
- if (e instanceof Exception) {
- throw (Exception)e;
- }
- else {
- throw new Exception(e);
- }
- }
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.componentType b/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 031f6aafd0..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
- <service name="TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- </service>
-
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- </reference>
-</componentType>
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.composite b/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index f4b4f2d5f2..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="TrafficAdvisoryNotificationRemoteProducerComposite">
-
- <component name="TrafficAdvisoryProducer">
- <implementation.java class="notification.producer.TrafficAdvisoryProducer"/>
- <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>
- </component>
-
- <component name="TrafficAdvisoryNotificationComponent">
- <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>
- </component>
-
- <reference name="TrafficAdvisoryNotificationCompositeReference"
- promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationReference">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- <tuscany:binding.notification notificationType="trafficAdvisory"/>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/wsdl/TrafficAdvisory.wsdl b/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/branches/sca-java-0.99/samples/binding-notification-producer/src/test/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<definitions name="TrafficAdvisory"
- targetNamespace="http://example.com/TrafficAdvisory.wsdl"
- xmlns:tns="http://example.com/TrafficAdvisory.wsdl"
- xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
- <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"
- xmlns:tns="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="trafficNotification">
- <complexType>
- <sequence>
- <element name="report" type="string" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </types>
-
- <message name="TrafficNotificationInput">
- <part name="body" element="xsd1:trafficNotification" />
- </message>
-
- <portType name="TrafficAdvisoryPortType">
- <operation name="trafficNotification">
- <input message="tns:TrafficNotificationInput" />
- </operation>
- </portType>
-
-</definitions>
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/README b/branches/sca-java-0.99/samples/calculator-distributed/README
deleted file mode 100644
index 81dd0c64e6..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/README
+++ /dev/null
@@ -1,297 +0,0 @@
-Calculator Distributed Sample
-=============================
-This sample implements a simple calculator using SCA components. It uses
-exactly the same calculator application classes as the calculator sample but
-runs the application distributed across three nodes.
-
-A node in this sample means an instance of the Tuscany SCA java runtime running
-in a Java virtual machine.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open four command prompts and
-navigate to this sample directory in each one. There is one command to be run
-in each command prompt:
-
-ant runDomainNode
-ant runNodeB
-ant runNodeC
-ant runNodeA
-
-Please run the commands in this order.
-
-OR if you don't have ant, on Windows use
-
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.DomainNode
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeB
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeC
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeA
-
-and on *nix do
-
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.DomainNode
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeB
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeC
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeA
-
-
-The processes started on each of these command prompts can be ended by pressing
-the <Enter> key.
-
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java)
-binding. NodeA exercises this interface by calling add, subtract, multiply and
-divide operations.
-
-In the case of add and subtract the runtime recognises that
-it can't find these services locally and, using the remote (web services)
-version of the default SCA binding contacts the add service running in NodeB
-and the subtract service running in NodeC.
-
-On the command prompt where you started NodeA, you would see output of invoking the
-calculator functions distributed over NodeB and and NodeC. On the command prompts
-where you have started NodeB and NodeC, you would see log messages that indicate that
-the add and substract services where called on these nodes respectively.
-
-The sample demonstrates that the calculator application can be distributed
-across multiple nodes with no change to the application or to the SCA description
-files.
-
-
-calculator/
- src/
- main/
- java/
- calculator/
- CalculatorService.java - the first component, calls +-/* as
- appropriate
- AddService.java - adds two numbers
- AddServiceImpl.java
- SubtractService.java - subtracts one number from another
- SubtractServiceImpl.java
- MultiplyService.java - multiplies two numbers
- MultiplyServiceImpl.java
- DivideService.java - divides one number by another
- DivideServiceImpl.java
- node/
- CalculatorNode.java - runs up an sca application based on
- configuration given on the command
- line in the form
-
- CalculatorNode <domain name> <node name>
-
- it looks for a directory name the same
- as <node name> and loads the composites
- there
-
- if <node name> = nodeA it calls the
- +-/* operations otherwise it behaves
- like a server and waits for service
- requests
- DomainNode.java - the node that provides the service
- discovery mechanism to the distributed
- domain
- resources/
- domain - the SCA assembly for the service discovery
- function
- management/ - the SCA assembly for each nodes management
- function
- nodeA - the SCA assembly for nodeA's part of the
- calculator application
- nodeB - the SCA assembly for nodeB's part of the
- calculator application
- nodeC - the SCA assembly for nodeB's part of the
- calculator application
- test/
- java/
- calculator/
- DomainInMemoryTestCase.java - JUnit test case which runs all of the
- separate ndes in a single VM for test
- purposes
- calculator-distributed.png - a pictorial representation of the sample
- .composite files
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd calculator-distributed
-ant compile
-ant runDomainNode
-ant runNodeB
-ant runNodeC
-ant runNodeA
-
-You should see the following output from the four separate command prompt:
-
-runDomainNode:
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] 23-Aug-2007 17:40:40 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8080/ServiceDiscoveryC
-omponent/ServiceDiscovery
- [java] Domain node started (press enter to shutdown)
- [java] Registering service: [mydomain nodeB AddServiceComponent org.apache.
-tuscany.sca.assembly.SCABinding http://localhost:8085/AddServiceComponent]
- [java] Registering service: [mydomain nodeC SubtractServiceComponent org.ap
-ache.tuscany.sca.assembly.SCABinding http://localhost:8086/SubtractServiceCompon
-ent]
- [java] Finding service: [mydomain SubtractServiceComponent org.apache.tusca
-ny.sca.assembly.SCABinding]
- [java] Matching service url: http://localhost:8086/SubtractServiceComponent
-
- [java] Finding service: [mydomain AddServiceComponent org.apache.tuscany.sc
-a.assembly.SCABinding]
- [java] Matching service url: http://localhost:8085/AddServiceComponent
- [java] Java Result: 1
-Terminate batch job (Y/N)? y
-
-
-
-runNodeB:
- [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/
-target/classes/management/
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] Registering service: [mydomain nodeB AddServiceComponent/ org.apache
-.tuscany.sca.assembly.SCABinding http://localhost:8085/AddServiceComponent]
- [java] 23-Aug-2007 17:41:25 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8085/AddServiceCompone
-nt
- [java] Node started (press enter to shutdown)
- [java] AddService - add 3.0 and 2.0
-
-
-runNodeC:
- [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/
-target/classes/management/
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] Registering service: [mydomain nodeC SubtractServiceComponent org.ap
-ache.tuscany.sca.assembly.SCABinding http://localhost:8086/SubtractServiceCompon
-ent]
- [java] 23-Aug-2007 17:41:51 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
- [java] Node started (press enter to shutdown)
- [java] INFO: Added Servlet mapping: http://localhost:8086/SubtractServiceCo
-mponent
- [java] SubtractService - subtract 3.0 and 2.0
-Terminate batch job (Y/N)? y
-
-
-runNodeA:
- [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/
-target/classes/management/
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] 23-Aug-2007 17:42:12 org.apache.tuscany.sca.assembly.builder.impl.Co
-mpositeBuilderImpl$1 problem
- [java] WARNING: [WARNING] Component reference target not found, it might be
- a remote service: AddServiceComponent null
- [java]
- [java] 23-Aug-2007 17:42:12 org.apache.tuscany.sca.assembly.builder.impl.Co
-mpositeBuilderImpl$1 problem
- [java] WARNING: [WARNING] Component reference target not found, it might be
- a remote service: SubtractServiceComponent null
- [java]
- [java] Finding service: [mydomain SubtractServiceComponent org.apache.tusca
-ny.sca.assembly.SCABinding]
- [java] Finding service: [mydomain AddServiceComponent org.apache.tuscany.sc
-a.assembly.SCABinding]
- [java] CalculatorService - add 3.0 and 2.0
- [java] 3 + 2=5.0
- [java] CalculatorService - subtract 3.0 and 2.0
- [java] 3 - 2=1.0
- [java] CalculatorService - multiply 3.0 and 2.0
- [java] 3 * 2=6.0
- [java] CalculatorService - divide 3.0 and 2.0
- [java] 3 / 2=1.5
-
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows. When running from Maven the four nodes all run within
-Java virtual machine.
-
-cd calculator-distributed
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.DomainInMemoryTestCase
-Setting up distributed nodes
-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class
-es/management/
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX
-Utils).
-log4j:WARN Please initialize the log4j system properly.
-23-Aug-2007 18:18:41 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuild
-erImpl$1 problem
-WARNING: [WARNING] Component reference target not found, it might be a remote se
-rvice: AddServiceComponent null
-
-23-Aug-2007 18:18:41 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuild
-erImpl$1 problem
-WARNING: [WARNING] Component reference target not found, it might be a remote se
-rvice: SubtractServiceComponent null
-
-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class
-es/management/
-Registering service: [mydomain nodeB AddServiceComponent org.apache.tuscany.sca.
-assembly.SCABinding http://localhost:8085/AddServiceComponent]
-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class
-es/management/
-Registering service: [mydomain nodeC SubtractServiceComponent org.apache.tuscany
-.sca.assembly.SCABinding http://localhost:8086/SubtractServiceComponent]
-Finding service: [mydomain SubtractServiceComponent org.apache.tuscany.sca.assem
-bly.SCABinding]
-Matching service url: http://localhost:8086/SubtractServiceComponent
-Finding service: [mydomain AddServiceComponent org.apache.tuscany.sca.assembly.S
-CABinding]
-Matching service url: http://localhost:8085/AddServiceComponent
-23-Aug-2007 18:18:45 org.apache.tuscany.sca.http.jetty.JettyServer addServletMap
-ping
-INFO: Added Servlet mapping: http://localhost:8085/AddServiceComponent
-23-Aug-2007 18:18:47 org.apache.tuscany.sca.http.jetty.JettyServer addServletMap
-ping
-INFO: Added Servlet mapping: http://localhost:8086/SubtractServiceComponent
-CalculatorService - add 3.0 and 2.0
-AddService - add 3.0 and 2.0
-CalculatorService - subtract 3.0 and 2.0
-SubtractService - subtract 3.0 and 2.0
-CalculatorService - multiply 3.0 and 2.0
-CalculatorService - divide 3.0 and 2.0
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.14 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-
-This shows that the Junit test cases have run successfully.
-
-Known Bug :
----------
-The processes that are running NodeB and NodeC do not seem to end on pressing the
-<Enter>. This will be fixed for the next release. For this release you should use
-^C (Control C) to exit these processes.
-
-
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/build.xml b/branches/sca-java-0.99/samples/calculator-distributed/build.xml
deleted file mode 100644
index 96c79607ca..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/build.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="calculator" default="runDomainNode">
- <property name="node.class" value="node.CalculatorNode" />
- <property name="domain.class" value="node.DomainNode" />
- <property name="test.jar" value="sample-calculator-distributed.jar"
-/>
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="runDomainNode">
- <java classname="${domain.class}"
- fork="true">
- <classpath>
- <pathelement path="src/main/resources"/>
- <pathelement path="target/classes"/>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="runNodeA">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <pathelement path="src/main/resources"/>
- <pathelement path="target/classes"/>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeA"/>
- </java>
- </target>
-
- <target name="runNodeB">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <pathelement path="src/main/resources"/>
- <pathelement path="target/classes"/>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeB"/>
- </java>
- </target>
-
- <target name="runNodeC">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <pathelement path="src/main/resources"/>
- <pathelement path="target/classes"/>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeC"/>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-
- <!-- If you want to test without building the distribution jars set the -->
- <!-- localtion value of the m2.repo on your machine and use the targets below -->
- <property name="m2.repo" value="your dir here\.m2\repository" />
- <path id="repo.classpath">
- <!--pathelement location="${classpath}"/-->
- <pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>
- <pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>
- <pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>
- <pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>
- <pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
- <pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
- <pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
- <pathelement location="${m2.repo}\commons-io\commons-io\1.1\commons-io-1.1.jar"/>
- <pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
- <pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
- <pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>
- <pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>
- <pathelement location="${m2.repo}\jaxen\jaxen\1.1-beta-9\jaxen-1.1-beta-9.jar"/>
- <pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>
- <pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.2\axis2-java2wsdl-1.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.2\axis2-kernel-1.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\httpcomponents\jakarta-httpcore\4.0-alpha4\jakarta-httpcore-4.0-alpha4.jar"/>
- <pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.1\neethi-2.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.0-incubating-SNAPSHOT\sca-api-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.0-incubating-SNAPSHOT\tuscany-assembly-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.0-incubating-SNAPSHOT\tuscany-assembly-xml-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.0-incubating-SNAPSHOT\tuscany-binding-sca-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.0-incubating-SNAPSHOT\tuscany-binding-sca-axis2-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.0-incubating-SNAPSHOT\tuscany-binding-sca-xml-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.0-incubating-SNAPSHOT\tuscany-binding-ws-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.0-incubating-SNAPSHOT\tuscany-binding-ws-axis2-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.0-incubating-SNAPSHOT\tuscany-binding-ws-xml-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.0-incubating-SNAPSHOT\tuscany-contribution-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.0-incubating-SNAPSHOT\tuscany-contribution-impl-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.0-incubating-SNAPSHOT\tuscany-contribution-java-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.0-incubating-SNAPSHOT\tuscany-contribution-namespace-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.0-incubating-SNAPSHOT\tuscany-core-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.0-incubating-SNAPSHOT\tuscany-core-databinding-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.0-incubating-SNAPSHOT\tuscany-core-spi-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.0-incubating-SNAPSHOT\tuscany-databinding-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.0-incubating-SNAPSHOT\tuscany-databinding-axiom-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.0-incubating-SNAPSHOT\tuscany-distributed-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.0-incubating-SNAPSHOT\tuscany-distributed-impl-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.0-incubating-SNAPSHOT\tuscany-host-embedded-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.0-incubating-SNAPSHOT\tuscany-host-http-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-http-jetty\1.0-incubating-SNAPSHOT\tuscany-http-jetty-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.0-incubating-SNAPSHOT\tuscany-implementation-java-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.0-incubating-SNAPSHOT\tuscany-implementation-java-runtime-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.0-incubating-SNAPSHOT\tuscany-implementation-java-xml-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.0-incubating-SNAPSHOT\tuscany-interface-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.0-incubating-SNAPSHOT\tuscany-interface-java-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.0-incubating-SNAPSHOT\tuscany-interface-java-xml-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.0-incubating-SNAPSHOT\tuscany-interface-wsdl-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.0-incubating-SNAPSHOT\tuscany-interface-wsdl-xml-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.0-incubating-SNAPSHOT\tuscany-policy-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.0-incubating-SNAPSHOT\tuscany-policy-xml-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.0-incubating-SNAPSHOT\tuscany-topology-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.0-incubating-SNAPSHOT\tuscany-topology-xml-1.0-incubating-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7a\woden-1.0-incubating-M7a.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.4\axiom-api-1.2.4.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.4\axiom-dom-1.2.4.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.4\axiom-impl-1.2.4.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.1\XmlSchema-1.3.1.jar"/>
- <pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>
- <pathelement location="${m2.repo}\org\mortbay\jetty\jetty\6.1.0\jetty-6.1.0.jar"/>
- <pathelement location="${m2.repo}\org\mortbay\jetty\jetty-util\6.1.0\jetty-util-6.1.0.jar"/>
- <pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>
- <pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>
- <pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>
- <pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>
- <pathelement location="target/classes"/>
- </path>
-
- <target name="runDomainNodeRepo">
- <java classname="${domain.class}"
- fork="true">
- <classpath>
- <path refid="repo.classpath"/>
- </classpath>
- </java>
- </target>
-
- <target name="runNodeARepo">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <path refid="repo.classpath"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeA"/>
- </java>
- </target>
-
- <target name="runNodeBRepo">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <path refid="repo.classpath"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeB"/>
- </java>
- </target>
-
- <target name="runNodeCRepo">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <path refid="repo.classpath"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeC"/>
- </java>
- </target>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.png b/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.png
deleted file mode 100644
index 7c0e175664..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.svg b/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.svg
deleted file mode 100644
index be5a4b8185..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/calculator-distributed.svg
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-distributed"
- sodipodi:docname="calculator-distributed.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-distributed\calculator-distributed.png"
- inkscape:export-xdpi="104.05"
- inkscape:export-ydpi="104.05">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.98994949"
- inkscape:cx="555.3085"
- inkscape:cy="454.41561"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1171"
- inkscape:window-height="871"
- inkscape:window-x="18"
- inkscape:window-y="27" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(1,0,0,1.144214,0,-27.53557)">
- <rect
- rx="15.307091"
- ry="16.178549"
- y="156.41957"
- x="258.31146"
- height="382.40201"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971927;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"
- transform="translate(-3.571429,-41.82534)"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">Calculator</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="191.57716"
- x="339.91632"
- y="262.1673"
- rx="6.9961648"
- ry="15.892869" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(79.61125,62.65764)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Calculator</flowPara><flowPara
- id="flowPara1895">Service</flowPara><flowPara
- id="flowPara1897">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
- id="path3019" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
- id="path1883" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1885"
- transform="translate(-46.16225,128.7269)"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
- id="flowRegion1887"><rect
- id="rect1889"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
- id="flowPara1891">Calculator</flowPara><flowPara
- id="flowPara1893">Service</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1899"
- width="115.66247"
- height="70.148659"
- x="594.75488"
- y="167.73451"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1901"
- transform="translate(334.4498,-31.77519)"><flowRegion
- id="flowRegion1903"><rect
- id="rect1905"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1907">Add</flowPara><flowPara
- id="flowPara1909">Service</flowPara><flowPara
- id="flowPara1911">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.31867,190.29606 L 606.65371,190.29606 L 612.71462,203.42804 L 605.64356,215.54988 L 573.31867,215.54988 L 580.89482,203.42804 L 573.31867,190.29606 z "
- id="path1913" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1917"
- width="115.66247"
- height="70.148659"
- x="594.06543"
- y="280.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1919"
- transform="translate(333.7604,81.08188)"><flowRegion
- id="flowRegion1921"><rect
- id="rect1923"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1925">Subtract</flowPara><flowPara
- id="flowPara1927">Service</flowPara><flowPara
- id="flowPara1929">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 572.62924,303.15313 L 605.96428,303.15313 L 612.02519,316.28511 L 604.95413,328.40695 L 572.62924,328.40695 L 580.20539,316.28511 L 572.62924,303.15313 z "
- id="path1931" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1933"
- width="115.66247"
- height="70.148659"
- x="594.77979"
- y="391.87729"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1935"
- transform="translate(334.4747,192.3676)"><flowRegion
- id="flowRegion1937"><rect
- id="rect1939"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1941">Multiply</flowPara><flowPara
- id="flowPara1943">Service</flowPara><flowPara
- id="flowPara1945">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.34352,414.43884 L 606.67856,414.43884 L 612.73947,427.57082 L 605.66841,439.69266 L 573.34352,439.69266 L 580.91967,427.57082 L 573.34352,414.43884 z "
- id="path1947" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1949"
- width="115.66247"
- height="70.148659"
- x="596.20831"
- y="502.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1951"
- transform="translate(335.9032,303.0819)"><flowRegion
- id="flowRegion1953"><rect
- id="rect1955"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1957">Divide</flowPara><flowPara
- id="flowPara1959">Service</flowPara><flowPara
- id="flowPara1961">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 574.77209,525.15313 L 608.10713,525.15313 L 614.16804,538.28511 L 607.09698,550.40695 L 574.77209,550.40695 L 582.34824,538.28511 L 574.77209,525.15313 z "
- id="path1963" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1965"
- transform="translate(161.0221,114.967)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1967"><rect
- id="rect1969"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1973">add</flowPara><flowPara
- id="flowPara1977">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
- id="path1979" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1981"
- transform="translate(160.6632,150.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1983"><rect
- id="rect1985"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1987">subtract</flowPara><flowPara
- id="flowPara1989">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
- id="path1991" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1993"
- transform="translate(161.3775,184.2583)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1995"><rect
- id="rect1997"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1999">multiply</flowPara><flowPara
- id="flowPara2001">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
- id="path2003" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2005"
- transform="translate(159.9489,215.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2007"><rect
- id="rect2009"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2011">divide</flowPara><flowPara
- id="flowPara2013">Service</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,335.52287 L 511.42857,335.52287 L 510.71429,202.66577 L 579.28571,202.66577"
- id="path2015" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,369.80878 L 528.57143,369.80878 L 528.57143,315.52306 L 580,315.52306"
- id="path2017" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 475.71429,435.52318 L 509.28571,435.52318 L 510,539.09463 L 582.14286,537.65613"
- id="path2021" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 292.85714,355.52305 L 330,354.80877"
- id="path2023" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.14286,404.09448 L 527.85714,404.09448 L 527.85714,427.66591 L 580,426.95163"
- id="path1950" />
- <rect
- style="opacity:0.32777776;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1.99999964;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999869, 1.99999955;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2844"
- width="328.57144"
- height="117.85712"
- x="532.85712"
- y="140.8802"
- rx="6.9961648"
- ry="2.4683809" />
- <rect
- style="opacity:0.32777776;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999958, 1.99999985;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2846"
- width="328.57144"
- height="98.571434"
- x="533.57147"
- y="268.73746"
- rx="6.9961648"
- ry="2.0644646" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2860"
- transform="translate(614.3034,-75.00004)"><flowRegion
- id="flowRegion2862"><rect
- id="rect2864"
- width="75"
- height="32.857143"
- x="173.57143"
- y="231.95163" /></flowRegion><flowPara
- id="flowPara2866">nodeB</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot2868"
- transform="translate(616.0952,47.8571)"><flowRegion
- id="flowRegion2870"><rect
- id="rect2872"
- width="75"
- height="32.857143"
- x="173.57143"
- y="231.95163" /></flowRegion><flowPara
- id="flowPara2874">nodeC</flowPara></flowRoot> <path
- style="opacity:0.35555558;fill:#efacac;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,3;stroke-dashoffset:0"
- d="M 172.73609,222.85576 L 495.9849,223.86592 L 498.00521,384.48017 L 863.68043,383.47002 L 862.67028,606.71373 L 173.74624,605.70358 L 172.73609,222.85576 z "
- id="path1975"
- sodipodi:nodetypes="ccccccc" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2852"
- transform="translate(8,0)"><flowRegion
- id="flowRegion2854"><rect
- id="rect2856"
- width="75"
- height="32.857143"
- x="173.57143"
- y="231.95163" /></flowRegion><flowPara
- id="flowPara2858">nodeA</flowPara></flowRoot> </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/pom.xml b/branches/sca-java-0.99/samples/calculator-distributed/pom.xml
deleted file mode 100644
index 51f0f3cbe8..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-samples</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>sample-calculator-distributed</artifactId>
- <name>Apache Tuscany Distributed Calculator Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distributed</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distributed-impl</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-topology</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-topology-xml</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-axis2</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <!-- dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency -->
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-http-jetty</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddService.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddService.java
deleted file mode 100644
index d7dc4473ad..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The Add service interface
- */
-@Remotable
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9b7e254e5..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
- public double add(double n1, double n2) {
- System.out.println("AddService - add " + n1 + " and " + n2);
- return n1 + n2;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index da869e00fd..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 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 setMultiplyService(MultiplyService multiplyService) {
- this.multiplyService = multiplyService;
- }
-
- @Reference
- public void setDivideService(DivideService divideService) {
- this.divideService = divideService;
- }
-
- public double add(double n1, double n2) {
- System.out.println("CalculatorService - add " + n1 + " and " + n2);
- return addService.add(n1, n2);
- }
-
- public double subtract(double n1, double n2) {
- System.out.println("CalculatorService - subtract " + n1 + " and " + n2);
- return subtractService.subtract(n1, n2);
- }
-
- public double multiply(double n1, double n2) {
- System.out.println("CalculatorService - multiply " + n1 + " and " + n2);
- return multiplyService.multiply(n1, n2);
- }
-
- public double divide(double n1, double n2) {
- System.out.println("CalculatorService - divide " + n1 + " and " + n2);
- return divideService.divide(n1, n2);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 78ab9c6ee0..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the multiply service
- */
-@Remotable
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1010207154..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
- public double subtract(double n1, double n2) {
- System.out.println("SubtractService - subtract " + n1 + " and " + n2);
- return n1 - n2;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
deleted file mode 100644
index bb939816bb..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package node;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;
-import org.apache.tuscany.sca.distributed.domain.impl.DistributedSCADomainMemoryImpl;
-import org.apache.tuscany.sca.distributed.domain.impl.DistributedSCADomainNetworkImpl;
-import org.apache.tuscany.sca.distributed.node.impl.EmbeddedNode;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import calculator.CalculatorService;
-
-/**
- * This client program shows how to run a distributed SCA node. In this case a
- * calculator node has been constructed specifically for running the calculator
- * composite. Internally it creates a representation of a node and associates a
- * distributed domain with the node. This separation is made different implementations
- * of the distributed domain can be provided.
- */
-public class CalculatorNode {
-
-
- public static void main(String[] args) throws Exception {
-
- // Check that the correct arguments have been provided
- if (null == args || args.length != 2) {
- System.err.println("Useage: java CalculatorNode domainname nodename");
- System.exit(1);
- }
-
- try {
- String domainName = args[0];
- String nodeName = args[1];
-
- // Create the distributed domain representation. We use the network implementation
- // here so that the node contacts a registry running somewhere out on the
- // network.
- DistributedSCADomain distributedDomain = new DistributedSCADomainNetworkImpl(domainName);
-
- // create the node that runs the calculator component
- EmbeddedNode node = new EmbeddedNode(nodeName);
- SCADomain domain = node.attachDomain(distributedDomain);
-
- // the application components are added. The null here just gets the node
- // implementation to read a directory from the classpath with the node name
- // TODO - should be done as a management action.
- node.addContribution(domainName, null);
-
- // start the node
- // TODO - should be done as a management action.
- node.start();
-
- // nodeA is the head node and runs some tests while all other nodes
- // simply listen for incoming messages
- if ( nodeName.equals("nodeA") ) {
- // do some application stuff
- 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));
- } else {
- // start up and wait for messages
- try {
- System.out.println("Node started (press enter to shutdown)");
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- // stop the node and all the domains in it
- domain.close();
-
- } catch(Exception ex) {
- System.err.println("Exception in node - " + ex.getMessage());
- ex.printStackTrace(System.err);
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.java
deleted file mode 100644
index 9abfc03606..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.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 node;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This server program that loads a composite to provide simple registry function.
- * This server can be replaced with any registry that is appropriate but the components
- * in each node that talk to the registry should be replaced also.
- */
-public class DomainNode {
-
- public static void main(String[] args) {
-
- SCADomain scaDomain = SCADomain.newInstance("domain/domain.composite");
-
- try {
- System.out.println("Domain node started (press enter to shutdown)");
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- scaDomain.close();
- System.out.println("Domain node stopped");
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/META-INF/sca-contribution.xml
deleted file mode 100644
index 3f9ed8024b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite
deleted file mode 100644
index a11d94aa93..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Domain">
-
- <!--component name="DistributedDomainManagerComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.management.impl.DistributedDomainManagerMemoryImpl"/>
- <service name="DistributedDomainManager">
- <interface.java interface="org.apache.tuscany.sca.distributed.management.DistributedDomainManager"/>
- <binding.ws uri="http://localhost:8080/DistributedDomainManagerComponent/DistributedDomainManager"/>
- </service>
- </component-->
-
- <component name="ServiceDiscoveryComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.management.impl.ServiceDiscoveryMemoryImpl" />
- <service name="ServiceDiscovery">
- <interface.java interface="org.apache.tuscany.sca.distributed.management.ServiceDiscovery"/>
- <binding.ws uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscovery"/>
- </service>
- </component>
-
-
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/META-INF/sca-contribution.xml
deleted file mode 100644
index b73217ebb8..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://management"
- xmlns:management="http://management">
- <deployable composite="management:Management"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite
deleted file mode 100644
index 68f466344a..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://management"
- xmlns:sample="http://management"
- name="Management">
-
- <!--component name="DistributedDomainManagerComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.management.impl.DistributedDomainManagerNetworkImpl"/>
- <reference name="distributedDomainManager">
- <interface.java interface="org.apache.tuscany.sca.distributed.management.DistributedDomainManager"/>
- <binding.ws uri="http://localhost:8080/DistributedDomainManagerComponent/DistributedDomainManager"/>
- </reference>
- </component-->
-
- <component name="ServiceDiscoveryComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.management.impl.ServiceDiscoveryNetworkImpl" />
- <reference name="serviceDiscovery">
- <binding.ws uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscovery"/>
- </reference>
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
deleted file mode 100644
index a111dfd064..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent" />
- <reference name="subtractService" target="SubtractServiceComponent" />
- <reference name="multiplyService" target="MultiplyServiceComponent"/>
- <reference name="divideService" target="DivideServiceComponent" />
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl" />
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index 3f9ed8024b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
deleted file mode 100644
index bf226d9109..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 3f9ed8024b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
deleted file mode 100644
index 4ef4c5ddb6..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl" />
- <service name="SubtractService">
- <binding.sca uri="http://localhost:8086/SubtractServiceComponent"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index 3f9ed8024b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java b/branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
deleted file mode 100644
index a6d47115a6..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES 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 java.io.File;
-import java.net.URL;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;
-import org.apache.tuscany.sca.distributed.domain.impl.DistributedSCADomainMemoryImpl;
-import org.apache.tuscany.sca.distributed.node.impl.EmbeddedNode;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import calculator.CalculatorService;
-
-/**
- * Runs a distributed domain in a single VM by using and in memory
- * implementation of the distributed domain
- */
-public class DomainInMemoryTestCase {
-
- private static String DEFULT_DOMAIN_NAME = "mydomain";
-
- private static DistributedSCADomain distributedDomain;
- private static EmbeddedNode nodeA;
- private static SCADomain domainA;
- private static EmbeddedNode nodeB;
- private static SCADomain domainB;
- private static EmbeddedNode nodeC;
- private static SCADomain domainC;
- private static CalculatorService calculatorServiceA;
-
- @BeforeClass
- public static void init() throws Exception {
- System.out.println("Setting up distributed nodes");
-
- File currentDirectory = new File (".");
- URL contributionURL = null;
-
- // Create the distributed domain representation
- distributedDomain = new DistributedSCADomainMemoryImpl(DEFULT_DOMAIN_NAME);
-
- // create the node that runs the
- // calculator component
- nodeA = new EmbeddedNode("nodeA");
- domainA = nodeA.attachDomain(distributedDomain);
- contributionURL = Thread.currentThread().getContextClassLoader().getResource("nodeA/");
- nodeA.addContribution(DEFULT_DOMAIN_NAME, contributionURL);
-
- // create the node that runs the
- // add component
- nodeB = new EmbeddedNode("nodeB");
- domainB = nodeB.attachDomain(distributedDomain);
- contributionURL = Thread.currentThread().getContextClassLoader().getResource("nodeB/");
- nodeB.addContribution(DEFULT_DOMAIN_NAME, contributionURL);
-
- // create the node that runs the
- // subtract component
- nodeC = new EmbeddedNode("nodeC");
- domainC = nodeC.attachDomain(distributedDomain);
- contributionURL = Thread.currentThread().getContextClassLoader().getResource("nodeC/");
- nodeC.addContribution(DEFULT_DOMAIN_NAME, contributionURL);
-
-
- // start all of the nodes
- nodeA.start();
- nodeB.start();
- nodeC.start();
-
- // get a reference to the calculator service from domainA
- // which will be running this component
- calculatorServiceA = domainA.getService(CalculatorService.class, "CalculatorServiceComponent");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- // stop the nodes and hence the domains they contain
- nodeA.stop();
- nodeB.stop();
- nodeC.stop();
- }
-
- @Test
- public void testCalculator() throws Exception {
-
- // Calculate
- Assert.assertEquals(calculatorServiceA.add(3, 2), 5.0);
- Assert.assertEquals(calculatorServiceA.subtract(3, 2), 1.0);
- Assert.assertEquals(calculatorServiceA.multiply(3, 2), 6.0);
- Assert.assertEquals(calculatorServiceA.divide(3, 2), 1.5);
-
-
- }
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/README b/branches/sca-java-0.99/samples/calculator-rmi-reference/README
deleted file mode 100644
index 837b5ce75f..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/README
+++ /dev/null
@@ -1,138 +0,0 @@
-Calculator RMI Reference Sample
-===============================
-
-This sample illustrates the use of Tuscany RMI Binding to call reference
-services that are hosted as Java RMI services.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, first
-navigate to the calculator-rmi-service sample and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-rmi-service.jar calculator.CalculatorServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-rmi-service.jar calculator.CalculatorServer
-
-Now you have the server running you need to open another command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-rmi-reference.jar calculator.CalculatorClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-rmi-reference.jar calculator.CalculatorClient
-
-Sample Overview
----------------
-This sample extends the calculator sample by replacing the local wired
-connections with RMI bindings. Instead of local add, subtract, multiply and
-divide components, an RMI service implementation now provides the
-add, subtract, multiply and divide interfaces and is hosted as an RMI server.
-References specified in the .composite file include an RMI binding which targets
-this RMI server.
-
-This sample adds a number of classes to the basic calculator sample:
-
-calculator-rmi-reference/
- src/
- main/
- java/
- calculator/
- CalculatorService.java - as calculator sample
- AddService.java - as calculator sample
- SubtractService.java - as calculator sample
- MultipleService.java - as calculator sample
- DivideService.java - as calculator sample
- CalculatorClient.java - as calculator sample
- CalculatorServiceImpl.java - calls the RMI service
- that provides the target for the
- RMI bindings in the composite
- resources/
- CalculatorRMIReference.composite - the SCA assembly for this sample
- test/
- java/
- calculator/
- CalculatorRMIReferenceTestCase.java - JUnit test case
- CalculatorRMIServiceImpl.java - test RMI service to call
- calculator-rmi-reference.png - a pictorial representation of the
- .composite file
- build.xml - the Ant build file for the client
- pom.xml - the Maven build file
-
-Note. As this test creates and uses local network connections you may need to
-configure your firewall, if you are running one, to allow the test to run
-successfully.
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant.
-
-The server provides an RMI server that the acts as a target for the SCA RMI
-bindings. Start a new console and use the following commands.
-
-cd calculator-rmi-service
-ant compile
-ant run
-
-This will run up the server and display the following.
-
-run:
- [java] Starting of the SCA Calculator Application exposed as RMI Services...
- [java] ...Press Enter to Exit...
-
-The client is very similar to the calculator sample. It starts the SCA runtime
-and calls each of the calculator operations. In doing this the RMI bindings
-make calls out to the RMI server you started in the previous step. Start
-a new console and use the following commands.
-
-cd calculator-rmi-reference
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] 3 + 2=5.0
- [java] 3 - 2=1.0
- [java] 3 * 2=6.0
- [java] 3 / 2=1.5
-
-If you now return to the console window running the server and press enter the
-server should stop.
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd calculator-rmi-reference
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorRMIReferenceTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.308 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
-
-
-
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/build.xml b/branches/sca-java-0.99/samples/calculator-rmi-reference/build.xml
deleted file mode 100644
index 30817fe6f0..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="calculator-rmi-reference-client" default="compile">
- <property name="test.class" value="calculator.CalculatorClient" />
- <property name="test.jar" value="sample-calculator-rmi-reference.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.png b/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.png
deleted file mode 100644
index 8c76b77a9f..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.svg
deleted file mode 100644
index ba802e6717..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/calculator-rmi-reference.svg
+++ /dev/null
@@ -1,412 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-rmi-reference"
- sodipodi:docname="calculator-rmi-reference.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-rmi-reference\calculator-rmi-reference.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="553.58838"
- inkscape:cy="368.42498"
- inkscape:document-units="px"
- inkscape:current-layer="g2997"
- inkscape:window-width="1134"
- inkscape:window-height="721"
- inkscape:window-x="1"
- inkscape:window-y="105" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(0.679966,0,0,1.144214,82.34853,-27.53557)">
- <rect
- rx="15.307091"
- ry="12.692303"
- y="192.00233"
- x="258.31146"
- height="299.99988"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.2674253;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"
- transform="matrix(1.365843,0,0,1,-103.2086,0)"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">Calculator</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="191.57716"
- x="339.91632"
- y="262.1673"
- rx="6.9961648"
- ry="15.892869" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(79.61125,62.65764)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Calculator</flowPara><flowPara
- id="flowPara1895">Service</flowPara><flowPara
- id="flowPara1897">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
- id="path3019" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
- id="path1883" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1885"
- transform="translate(-46.16225,128.7269)"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
- id="flowRegion1887"><rect
- id="rect1889"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
- id="flowPara1891">Calculator</flowPara><flowPara
- id="flowPara1893">Service</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1899"
- width="115.66247"
- height="70.148659"
- x="773.32635"
- y="331.87738"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1901"
- transform="translate(498.7355,125.2248)"><flowRegion
- id="flowRegion1903"><rect
- id="rect1905"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1907">Calculator</flowPara><flowPara
- id="flowPara1909">Service</flowPara><flowPara
- id="flowPara1911">RMI</flowPara><flowPara
- id="flowPara2004">Impl</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 567.77069,220.86752 L 630.65876,220.86752 L 642.09292,246.48812 L 628.75306,270.13795 L 567.77069,270.13795 L 582.06342,246.48812 L 567.77069,220.86752 z "
- id="path1913" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1965"
- transform="translate(161.0221,114.967)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1967"><rect
- id="rect1969"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1973">add</flowPara><flowPara
- id="flowPara1977">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
- id="path1979" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1981"
- transform="translate(160.6632,150.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1983"><rect
- id="rect1985"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1987">subtract</flowPara><flowPara
- id="flowPara1989">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
- id="path1991" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1993"
- transform="translate(161.3775,184.2583)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1995"><rect
- id="rect1997"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1999">multiply</flowPara><flowPara
- id="flowPara2001">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
- id="path2003" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2005"
- transform="translate(159.9489,215.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2007"><rect
- id="rect2009"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2011">divide</flowPara><flowPara
- id="flowPara2013">Service</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
- id="path2015" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
- id="path2017" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
- id="path2019" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
- id="path2021" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 292.85714,355.52305 L 330,354.80877"
- id="path2023" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1950"
- transform="translate(301.0221,17.10977)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1952"><rect
- id="rect1954"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1958">Add</flowPara><flowPara
- id="flowPara1962">Reference</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 567.83889,304.45927 L 630.72696,304.45927 L 642.16112,330.07987 L 628.82126,353.7297 L 567.83889,353.7297 L 582.13162,330.07987 L 567.83889,304.45927 z "
- id="path1964" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1966"
- transform="translate(301.0903,100.7015)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1968"><rect
- id="rect1970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1972">Subtract</flowPara><flowPara
- id="flowPara1974">Reference</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 567.1246,382.31641 L 630.01267,382.31641 L 641.44683,407.93701 L 628.10697,431.58684 L 567.1246,431.58684 L 581.41733,407.93701 L 567.1246,382.31641 z "
- id="path1976" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1978"
- transform="translate(300.376,178.5587)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1980"><rect
- id="rect1982"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1984">Multiply</flowPara><flowPara
- id="flowPara1986">Reference</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 569.98175,459.45927 L 632.86982,459.45927 L 644.30398,485.07987 L 630.96412,508.7297 L 569.98175,508.7297 L 584.27448,485.07987 L 569.98175,459.45927 z "
- id="path1988" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1990"
- transform="translate(303.2332,255.7015)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1992"><rect
- id="rect1994"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1996">Divide</flowPara><flowPara
- id="flowPara1998">Reference</flowPara></flowRoot> <path
- sodipodi:type="arc"
- style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path2000"
- sodipodi:cx="736.78571"
- sodipodi:cy="361.95163"
- sodipodi:rx="39.642857"
- sodipodi:ry="38.57143"
- d="M 758.87546,329.92324 A 39.642857,38.57143 0 1 1 757.94075,329.33134"
- sodipodi:start="5.3034219"
- sodipodi:end="11.558474"
- sodipodi:open="true"
- transform="translate(-22.42857,4.142857)" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2006"
- transform="translate(411.7392,139.0467)"><flowRegion
- id="flowRegion2008"><rect
- id="rect2010"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2016">RMI</flowPara><flowPara
- id="flowPara2018">Registry</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 642.14286,246.23734 L 692.85714,333.3802"
- id="path2027" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 640.71429,330.52305 L 677.14286,350.52305"
- id="path2029" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 640.71429,408.3802 L 677.85714,382.66591"
- id="path2031" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 645,484.80877 L 693.57143,400.52305"
- id="path2033" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 753.57143,366.95163 L 773.57143,366.95163"
- id="path2035" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2037"
- transform="translate(385.3078,69.25256)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2039"><rect
- id="rect2041"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2045">RMI</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot2059"
- transform="translate(371.9396,116.0363)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2061"><rect
- id="rect2063"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2065">RMI</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot2067"
- transform="translate(366.9396,168.8935)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2069"><rect
- id="rect2071"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2073">RMI</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot2075"
- transform="translate(376.9396,209.6077)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2077"><rect
- id="rect2079"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2081">RMI</flowPara></flowRoot> </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/pom.xml b/branches/sca-java-0.99/samples/calculator-rmi-reference/pom.xml
deleted file mode 100644
index 80b5252cdb..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-calculator-rmi-reference</artifactId>
- <name>Apache Tuscany Calculator Sample using an RMI Service Reference</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
deleted file mode 100644
index ec57a6a533..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/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 interface for the add service
- */
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index cd1076c3f1..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.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 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("CalculatorRMIReference.composite");
- CalculatorService calculatorService =
- scaDomain.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));
-
- scaDomain.close();
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index d310dad4b1..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The Calculator service interface.
- */
-@Remotable
-public interface CalculatorService extends Remote {
-
- double add(double n1, double n2) throws RemoteException;
-
- double subtract(double n1, double n2) throws RemoteException;
-
- double multiply(double n1, double n2) throws RemoteException;
-
- double divide(double n1, double n2) throws RemoteException;
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index f28f0ca179..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 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-0.99/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/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 interface for the divide service
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/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-0.99/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/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 subtract service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
deleted file mode 100644
index a5a6e1cd29..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService">
- <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
- </reference>
- <reference name="subtractService">
- <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
- </reference>
- <reference name="multiplyService">
- <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
- </reference>
- <reference name="divideService">
- <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
- </reference>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
deleted file mode 100644
index 15e00f5946..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CalculatorRMIReferenceTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private CalculatorService calculatorService;
-
- @Override
- protected void setUp() throws Exception {
- CalculatorRMIServiceImpl rmiCalculatorImpl = new CalculatorRMIServiceImpl();
- Registry rmiRegistry = LocateRegistry.createRegistry(8099);
- rmiRegistry.bind("CalculatorRMIService", rmiCalculatorImpl);
-
- scaDomain = SCADomain.newInstance("CalculatorRMIReference.composite");
- calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- LocateRegistry.getRegistry(8099).unbind("CalculatorRMIService");
- }
-
- 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-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
deleted file mode 100644
index d8ded42cb2..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.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 java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorRMIServiceImpl extends UnicastRemoteObject implements CalculatorService {
-
- private static final long serialVersionUID = -1543948944662001428L;
-
- public CalculatorRMIServiceImpl() throws RemoteException {
- super();
- }
-
- public double add(double n1, double n2) throws RemoteException {
- return n1 + n2;
- }
-
- public double subtract(double n1, double n2) {
- return n1 - n2;
- }
-
- public double multiply(double n1, double n2) {
- return n1 * n2;
- }
-
- public double divide(double n1, double n2) {
- return n1 / n2;
- }
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/README b/branches/sca-java-0.99/samples/calculator-rmi-service/README
deleted file mode 100644
index 454cdc0d37..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/README
+++ /dev/null
@@ -1,147 +0,0 @@
-Calculator RMI Service Sample
-=============================
-
-This sample illustrates the use of Tuscany RMI Binding to expose component
-services as Java RMI Services. It also demonstrates how a simple Java RMI
-Client application invokes the SCA Application's services exposed as RMI
-Services.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-rmi-service.jar calculator.CalculatorServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-rmi-service.jar calculator.CalculatorServer
-
-Now you have the server running you need to open another command prompt, navigate
-to the calculator-rmi-reference sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-rmi-reference.jar calculator.CalculatorClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-rmi-reference.jar calculator.CalculatorClient
-
-
-Sample Overview
----------------
-This sample extends the calculator sample by replacing the local service
-binding with an RMI binding. SO a java client can call the service exposed
-by the SCA application using an RMI client.
-
-This sample adds a number of classes to the basic calculator sample:
-
-calculator-rmi-service/
- src/
- main/
- java/
- calculator/
- CalculatorService.java - as calculator sample
- CalculatorServiceImpl.java
- AddService.java - as calculator sample
- AddServiceImpl.java
- SubtractService.java - as calculator sample
- SubtractServiceImpl.java
- MultiplyService.java - as calculator sample
- MultiplyServiceImpl.java
- DivideService.java - as calculator sample
- DivideServiceImpl.java
- CalculatorClient.java - (Not currently used) Uses the
- java naming service to
- look up the Calculator RMI service.
- It then calls add, subtract, multiple
- and divide methods on the service
- CalculatorServer.java - starts the SCA Runtime and deploys
- the CalculatorRMIServer.composite.
- In doing this the SCA RMI binding
- acts to expose the CalculatorService
- over RMI.
- resources/
- CalculatorRMIServer.composite - the SCA assembly for this sample
- test/
- java/
- calculator/
- CalculatorRMIServerTestCase.java - JUnit test case
- calculator-rmi-service.png - a pictorial representation of the
- .composite file
- build.xml - the Ant build file for the server
- pom.xml - the Maven build file
-
-Note. As this test creates and uses local network connections you may need to
-configure your firewall, if you are running one, to allow the test to run
-successfully.
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant. Two
-build files are used to support client and server functions.
-
-The server starts the SCA runtime and loads the SCA calculator application
-which exposes an RMI service. Start a new console and use the following
-commands.
-
-cd calculator-rmi-service
-ant compile
-ant run
-
-This will run up the server and display the following.
-
-run:
- [java] Starting of the SCA Calculator Application exposed as RMI Services...
- [java] ...Press Enter to Exit...
-
-The client is very similar to the calculator sample
-
-It locates the RMI service that the SCA runtime is exposing and calls each of
-the calculator operations. Start a new console and use the following commands.
-
-cd calculator-rmi-reference
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] 3 + 2=5.0
- [java] 3 - 2=1.0
- [java] 3 * 2=6.0
- [java] 3 / 2=1.5
-
-If you now return to the console window running the server and press enter the
-server should stop.
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd calculator-rmi-service
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorRMIServerTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.819 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/build.xml b/branches/sca-java-0.99/samples/calculator-rmi-service/build.xml
deleted file mode 100644
index f98f35e4b0..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="calculator-rmi-service-server" default="compile">
- <property name="test.class" value="calculator.CalculatorServer" />
- <property name="test.jar" value="sample-calculator-rmi-service.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.png b/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.png
deleted file mode 100644
index 574f5eb14b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.svg b/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.svg
deleted file mode 100644
index 9253110f98..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/calculator-rmi-service.svg
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-rmi-service"
- sodipodi:docname="calculator-rmi-service.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-rmi-service\calculator-rmi-service.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="471.80491"
- inkscape:cy="378.84265"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="186"
- inkscape:window-y="165" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(1,0,0,1.144214,0,-27.53557)">
- <rect
- rx="15.307091"
- ry="12.692303"
- y="192.00233"
- x="258.31146"
- height="299.99988"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">Calculator</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="191.57716"
- x="339.91632"
- y="262.1673"
- rx="6.9961648"
- ry="15.892869" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(79.61125,62.65764)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Calculator</flowPara><flowPara
- id="flowPara1895">Service</flowPara><flowPara
- id="flowPara1897">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
- id="path3019" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
- id="path1883" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1885"
- transform="translate(-46.16225,128.7269)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1887"><rect
- id="rect1889"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1891">Calculator</flowPara><flowPara
- id="flowPara1893">Service</flowPara><flowPara
- id="flowPara1950">(RMI)</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1899"
- width="115.66247"
- height="70.148659"
- x="594.75488"
- y="209.73451"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1901"
- transform="translate(334.4498,10.22481)"><flowRegion
- id="flowRegion1903"><rect
- id="rect1905"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1907">Add</flowPara><flowPara
- id="flowPara1909">Service</flowPara><flowPara
- id="flowPara1911">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
- id="path1913" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1917"
- width="115.66247"
- height="70.148659"
- x="594.06543"
- y="292.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1919"
- transform="translate(333.7604,93.08188)"><flowRegion
- id="flowRegion1921"><rect
- id="rect1923"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1925">Subtract</flowPara><flowPara
- id="flowPara1927">Service</flowPara><flowPara
- id="flowPara1929">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
- id="path1931" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1933"
- width="115.66247"
- height="70.148659"
- x="594.77979"
- y="371.87729"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1935"
- transform="translate(334.4747,172.3676)"><flowRegion
- id="flowRegion1937"><rect
- id="rect1939"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1941">Multiply</flowPara><flowPara
- id="flowPara1943">Service</flowPara><flowPara
- id="flowPara1945">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
- id="path1947" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1949"
- width="115.66247"
- height="70.148659"
- x="596.20831"
- y="452.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1951"
- transform="translate(335.9032,253.0819)"><flowRegion
- id="flowRegion1953"><rect
- id="rect1955"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1957">Divide</flowPara><flowPara
- id="flowPara1959">Service</flowPara><flowPara
- id="flowPara1961">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
- id="path1963" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1965"
- transform="translate(161.0221,114.967)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1967"><rect
- id="rect1969"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1973">add</flowPara><flowPara
- id="flowPara1977">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
- id="path1979" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1981"
- transform="translate(160.6632,150.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1983"><rect
- id="rect1985"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1987">subtract</flowPara><flowPara
- id="flowPara1989">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
- id="path1991" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1993"
- transform="translate(161.3775,184.2583)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1995"><rect
- id="rect1997"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1999">multiply</flowPara><flowPara
- id="flowPara2001">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
- id="path2003" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2005"
- transform="translate(159.9489,215.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2007"><rect
- id="rect2009"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2011">divide</flowPara><flowPara
- id="flowPara2013">Service</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
- id="path2015" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
- id="path2017" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
- id="path2019" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
- id="path2021" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 292.85714,355.52305 L 330,354.80877"
- id="path2023" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/pom.xml b/branches/sca-java-0.99/samples/calculator-rmi-service/pom.xml
deleted file mode 100644
index fc1ca5f734..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-calculator-rmi-service</artifactId>
- <name>Apache Tuscany Calculator Sample exposing as RMI Service</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
deleted file mode 100644
index ec57a6a533..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/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 interface for the add service
- */
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/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-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 2b99485b68..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package calculator;
-
-import java.rmi.Naming;
-
-/**
- * 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 {
- CalculatorService calculatorService = (CalculatorService)Naming.lookup("//localhost:8099/CalculatorRMIService");
-
- // 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));
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
deleted file mode 100644
index b698163c1b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package calculator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * A claculator service server. Starts up the SCA runtime which
- * will start listening for RMI service requests.
- */
-public class CalculatorServer {
- public static void main(String[] args) throws Exception {
- System.out.println("Starting of the SCA Calculator Application exposed as RMI Services...");
- SCADomain scaDomain = SCADomain.newInstance("CalculatorRMIServer.composite");
- System.out.println("... Press Enter to Exit...");
- System.in.read();
- scaDomain.close();
- System.out.println("Exited...");
- System.exit(0);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 3ddcef61df..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.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 calculator;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The Calculator service interface.
- */
-@Remotable
-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-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index f28f0ca179..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 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-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/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 interface for the divide service
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/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-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/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-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/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-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/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 subtract service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/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-0.99/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
deleted file mode 100644
index 86322c248c..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <service name="CalculatorService">
- <interface.java interface="calculator.CalculatorService"/>
- <tuscany:binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
- </service>
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent"></reference>
- <reference name="subtractService" target="SubtractServiceComponent"></reference>
- <reference name="multiplyService" target="MultiplyServiceComponent"></reference>
- <reference name="divideService" target="DivideServiceComponent"></reference>
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/branches/sca-java-0.99/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
deleted file mode 100644
index 8943dd24f6..0000000000
--- a/branches/sca-java-0.99/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import java.rmi.Naming;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CalculatorRMIServerTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private CalculatorService calculatorService;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("CalculatorRMIServer.composite");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void testCalculator() throws Exception {
- // Calculate
- calculatorService = (CalculatorService)Naming.lookup("//localhost:8099/CalculatorRMIService");
- 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-0.99/samples/calculator-script/README b/branches/sca-java-0.99/samples/calculator-script/README
deleted file mode 100644
index ab1dda13df..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/README
+++ /dev/null
@@ -1,105 +0,0 @@
-Calculator Script Sample
-========================
-This sample implements a simple calculator using SCA components implemented
-using Java, JavaScript, Ruby, Python and Groovy.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-script.jar calculator.CalculatorClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator-script.jar calculator.CalculatorClient
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java)
-binding. The CalculatorClient exercises this interface by calling add,
-subtract, multiply and divide operations. This results in messages passing
-to the appropriate components in the composite across the local wires. Each
-component is implemented using a different language.
-
-calculator-script/
- src/
- main/
- java/
- calculator/
- CalculatorService.java - the first component calls +-/* as
- appropriate
- CalculatorServiceImpl.java
- AddService.java - adds two numbers
- SubtractService.java - subtracts one number from another
- MultiplyService.java - multiplies two numbers
- DivideService.java - divides one number by another
- CalculatorClient.java - starts the SCA Runtime and
- deploys the Calculator.composite.
- It then calls the deployed Calculator
- Components services
- resources/
- calculator/
- AddServiceImpl.js - A JavaScript implementation of the
- Add component
- SubtractServiceImpl.rb - A Ruby implementation of the Subtract
- component
- MultiplyServiceImpl.py - A Python implementation of the
- Multiple component
- DivideServiceImpl.groovy- A Groovy implementation of the
- Divide component
- Calculator.composite - the SCA assembly for this sample
-
- test/
- java/
- calculator/
- CalculatorTestCase.java - JUnit test case
- calculator-script.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd calculator-script
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] 3 + 2=5.0
- [java] 3 - 2=1.0
- [java] 3 * 2=6.0
- [java] 3 / 2=1.5
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd calculator-script
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.918 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/calculator-script/build.xml b/branches/sca-java-0.99/samples/calculator-script/build.xml
deleted file mode 100644
index 429d638ca5..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="calculator-script" default="compile">
- <property name="test.class" value="calculator.CalculatorClient" />
- <property name="test.jar" value="sample-calculator-script.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-script/calculator-script.png b/branches/sca-java-0.99/samples/calculator-script/calculator-script.png
deleted file mode 100644
index d3f8c491c3..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/calculator-script.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/calculator-script/calculator-script.svg b/branches/sca-java-0.99/samples/calculator-script/calculator-script.svg
deleted file mode 100644
index 16939f9310..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/calculator-script.svg
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-script"
- sodipodi:docname="calculator-script.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-script\calculator-script.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="471.80491"
- inkscape:cy="378.84265"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="59"
- inkscape:window-y="79" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(1,0,0,1.144214,0,-27.53557)">
- <rect
- rx="15.307091"
- ry="12.692303"
- y="192.00233"
- x="258.31146"
- height="299.99988"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">Calculator</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="191.57716"
- x="339.91632"
- y="262.1673"
- rx="6.9961648"
- ry="15.892869" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(79.61125,62.65764)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Calculator</flowPara><flowPara
- id="flowPara1895">Service</flowPara><flowPara
- id="flowPara1897">Component</flowPara><flowPara
- id="flowPara1950">(Java)</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
- id="path3019" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
- id="path1883" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1885"
- transform="translate(-46.16225,128.7269)"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
- id="flowRegion1887"><rect
- id="rect1889"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
- id="flowPara1891">Calculator</flowPara><flowPara
- id="flowPara1893">Service</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1899"
- width="115.66247"
- height="70.148659"
- x="594.75488"
- y="209.73451"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1901"
- transform="translate(334.4498,10.22481)"><flowRegion
- id="flowRegion1903"><rect
- id="rect1905"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1907">Add</flowPara><flowPara
- id="flowPara1909">Service</flowPara><flowPara
- id="flowPara1911">Component</flowPara><flowPara
- id="flowPara1952">(Javascript)</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
- id="path1913" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1917"
- width="115.66247"
- height="70.148659"
- x="594.06543"
- y="292.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1919"
- transform="translate(333.7604,93.08188)"><flowRegion
- id="flowRegion1921"><rect
- id="rect1923"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1925">Subtract</flowPara><flowPara
- id="flowPara1927">Service</flowPara><flowPara
- id="flowPara1929">Component</flowPara><flowPara
- id="flowPara1954">(Ruby)</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
- id="path1931" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1933"
- width="115.66247"
- height="70.148659"
- x="594.77979"
- y="371.87729"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1935"
- transform="translate(334.4747,172.3676)"><flowRegion
- id="flowRegion1937"><rect
- id="rect1939"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1941">Multiply</flowPara><flowPara
- id="flowPara1943">Service</flowPara><flowPara
- id="flowPara1945">Component</flowPara><flowPara
- id="flowPara1956">(Python)</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
- id="path1947" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1949"
- width="115.66247"
- height="70.148659"
- x="596.20831"
- y="452.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1951"
- transform="translate(335.9032,253.0819)"><flowRegion
- id="flowRegion1953"><rect
- id="rect1955"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1957">Divide</flowPara><flowPara
- id="flowPara1959">Service</flowPara><flowPara
- id="flowPara1961">Component</flowPara><flowPara
- id="flowPara1958">(Groovy)</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
- id="path1963" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1965"
- transform="translate(161.0221,114.967)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1967"><rect
- id="rect1969"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1973">add</flowPara><flowPara
- id="flowPara1977">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
- id="path1979" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1981"
- transform="translate(160.6632,150.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1983"><rect
- id="rect1985"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1987">subtract</flowPara><flowPara
- id="flowPara1989">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
- id="path1991" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1993"
- transform="translate(161.3775,184.2583)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1995"><rect
- id="rect1997"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1999">multiply</flowPara><flowPara
- id="flowPara2001">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
- id="path2003" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2005"
- transform="translate(159.9489,215.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2007"><rect
- id="rect2009"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2011">divide</flowPara><flowPara
- id="flowPara2013">Service</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
- id="path2015" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
- id="path2017" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
- id="path2019" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
- id="path2021" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 292.85714,355.52305 L 330,354.80877"
- id="path2023" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/calculator-script/pom.xml b/branches/sca-java-0.99/samples/calculator-script/pom.xml
deleted file mode 100644
index 0178233717..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-calculator-script</artifactId>
- <name>Apache Tuscany Calculator Sample implemented using scripting languages</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-script</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-wsdl-xml</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/AddService.java b/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/AddService.java
deleted file mode 100644
index a235e648c7..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/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 interface for the add service
- */
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 243d1562dc..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorClient.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 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");
-
- 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-0.99/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index c89043276e..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorService.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 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-0.99/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index ba897fa301..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 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-0.99/samples/calculator-script/src/main/java/calculator/DivideService.java b/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 497dafd4fd..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/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 interface for the divide service
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/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-0.99/samples/calculator-script/src/main/java/calculator/SubtractService.java b/branches/sca-java-0.99/samples/calculator-script/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 376b3e5bb9..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/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 subtract service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/Calculator.composite b/branches/sca-java-0.99/samples/calculator-script/src/main/resources/Calculator.composite
deleted file mode 100644
index 8a765e6153..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent" />
- <reference name="subtractService" target="SubtractServiceComponent" />
- <reference name="multiplyService" target="MultiplyServiceComponent" />
- <reference name="divideService" target="DivideServiceComponent" />
- </component>
-
- <component name="AddServiceComponent">
- <tuscany:implementation.script script="calculator/AddServiceImpl.js"/>
- </component>
-
- <component name="SubtractServiceComponent">
- <tuscany:implementation.script script="calculator/SubtractServiceImpl.rb"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <tuscany:implementation.script script="calculator/MultiplyServiceImpl.py"/>
- </component>
-
- <component name="DivideServiceComponent">
- <tuscany:implementation.script script="calculator/DivideServiceImpl.groovy"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
deleted file mode 100644
index 1d4d221364..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-function add(n1, n2) {
- return n1 + n2;
-} \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
deleted file mode 100644
index c31c1e8fd6..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-def divide(n1, n2) {
- return n1 / n2
-} \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
deleted file mode 100644
index d6f27ca7f5..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-def multiply(n1, n2):
- return n1 * n2 \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
deleted file mode 100644
index 132a1d13b0..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-def subtract(n1, n2)
- return n1 - n2
-end \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/branches/sca-java-0.99/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index fea8f62110..0000000000
--- a/branches/sca-java-0.99/samples/calculator-script/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 SCADomain scaDomain;
- private CalculatorService calculatorService;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("Calculator.composite");
- calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
- }
-
- @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-0.99/samples/calculator-webapp-ws/README b/branches/sca-java-0.99/samples/calculator-webapp-ws/README
deleted file mode 100644
index 0e97f4de33..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/README
+++ /dev/null
@@ -1,117 +0,0 @@
-Calculator Sample Exposing Web Services In A WebApp
-===================================================
-This sample uses the same code as the calculator sample, it deploys the
-sample wrapped in a web app and exposes the AddService as a web service.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want
-to give this sample a go deploy the WAR file (target/sample-calculator-webapp.war)
-to you web application server.
-
-*****
-Note: this sample does not come with a pre-built WAR so you must first
- build the sample by following the building instructions below
-*****
-
-You may find that you need to remove the servlet-api jars in WEB-INF/lib
-depending on which app server you are using.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8085/sample-calculator-webapp-ws/calc.jsp
-
-The port and hostname will of course vary depending on your local installation.
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java)
-binding. The CalculatorClient exercises this interface by calling add,
-subtract, multiply and divide operations. This results in messages passing to
-the appropriate components in the composite across the local wires.
-
-calculator-webapp/
- src/
- main/
- java/
- calculator/
- CalculatorService.java - As calculator sample
- CalculatorServiceImpl.java
- AddService.java - As calculator sample
- AddServiceImpl.java
- SubtractService.java - As calculator sample
- SubtractServiceImpl.java
- MultiplyService.java - As calculator sample
- MultiplyServiceImpl.java
- DivideService.java - As calculator sample
- DivideServiceImpl.java
- CalculatorClient.java - As calculator sample
- resources/
- Calculator.composite - As calculator sample except that the
- connection between the CalculatorService
- and the AddService is web services
- webapp
- META-INF/
- sca-contribution.xml - specifies the composite to be deployed
- WEB-INF/
- web.xml - defines the listener that starts up the
- Tuscany SCA runtime and maps service
- calls to the TuscanyServlet
- calc.jsp - the web application that makes use of the
- SCA application
- test/
- java/
- calculator/
- CalculatorTestCase.java - JUnit test case
-
- calculator.png - a pictorial representation of the sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as
-follows
-
-cd calculator-web
-ant package
-
-This should result in a war file (sample-calculator-webapp.war) in the target
-directory. Copy this war file to your web app deployment directory in you
-web app container.
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8085/sample-calculator-webapp/calc.jsp
-
-The port and hostname will of course vary depending on your local installation.
-
-You should see the following output.
-
-Expression Result
-2 + 3 5.0
-3 - 2 1.0
-3 * 2 6.0
-3 / 2 1.5
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd calculator-web
-mvn
-
-Again this should result in a war file (sample-calculator-webapp.war) in the target
-directory. Follow the steps described in the previous section for running the web
-app and for the expected results.
-
-
-
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/build.xml b/branches/sca-java-0.99/samples/calculator-webapp-ws/build.xml
deleted file mode 100644
index 7c54e9607d..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/build.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="calculator-webap-ws" default="package">
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- <pathelement path="target/classes"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
-
- </copy>
- </target>
-
- <target name="package" depends="compile">
- <war destfile="target/sample-calculator-webapp-ws.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <zipfileset dir="../../modules" prefix="WEB-INF/lib">
- <include name="sca-api-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-feed-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-axis2-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-axiom-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-jaxb-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-sdo-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-distributed-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-extension-helper-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-runtime-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-0.99-incubating-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="../../lib">
- <include name="activation-1.1.jar"/>
- <include name="annogen-0.1.0.jar"/>
- <include name="ant-1.7.0.jar"/>
- <include name="ant-launcher-1.7.0.jar"/>
- <include name="avalon-framework-4.1.3.jar"/>
- <include name="axiom-api-1.2.4.jar"/>
- <include name="axiom-dom-1.2.4.jar"/>
- <include name="axiom-impl-1.2.4.jar"/>
- <include name="axis2-java2wsdl-1.2.jar"/>
- <include name="axis2-kernel-1.2.jar"/>
- <include name="backport-util-concurrent-2.2.jar"/>
- <include name="backport-util-concurrent-3.0.jar"/>
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="common-2.2.3.jar"/>
- <include name="commons-codec-1.3.jar"/>
- <include name="commons-fileupload-1.1.1.jar"/>
- <include name="commons-httpclient-3.0.1.jar"/>
- <include name="commons-io-1.1.jar"/>
- <include name="commons-logging-1.1.jar"/>
- <include name="ecore-2.2.3.jar"/>
- <include name="ecore-change-2.2.3.jar"/>
- <include name="ecore-xmi-2.2.3.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="geronimo-jms_1.1_spec-1.1.jar"/>
- <include name="jakarta-httpcore-4.0-alpha4.jar"/>
- <include name="jaxb-api-2.1.jar"/>
- <include name="jaxb-impl-2.1.4.jar"/>
- <include name="jaxen-1.1-beta-9.jar"/>
- <include name="jaxws-api-2.1.jar"/>
- <include name="jdom-1.0.jar"/>
- <include name="json-rpc-1.0.jar"/>
- <include name="jsr181-api-1.0-MR1.jar"/>
- <include name="jsr250-api-1.0.jar"/>
- <include name="log4j-1.2.12.jar"/>
- <include name="logkit-1.0.1.jar"/>
- <include name="mail-1.4.jar"/>
- <include name="neethi-2.0.1.jar"/>
- <include name="rome-0.9.jar"/>
- <include name="saaj-api-1.3.jar"/>
- <include name="sca-api-0.99-incubating-SNAPSHOT.jar"/>
- <include name="stax-api-1.0-2.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="woden-1.0-incubating-M7a.jar"/>
- <include name="wsdl4j-1.6.2.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- <include name="xercesImpl-2.8.1.jar"/>
- <include name="xml-apis-1.3.03.jar"/>
- <include name="XmlSchema-1.3.1.jar"/>
- <include name="xsd-2.2.3.jar"/>
- <include name="tuscany-sdo-api-r2.1-1.0-incubating.jar"/>
- <include name="tuscany-sdo-impl-1.0-incubating.jar"/>
- <include name="tuscany-sdo-lib-1.0-incubating.jar"/>
- </lib>
- <classes dir="target/classes"/>
- </war>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.png b/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.png
deleted file mode 100644
index f482b8d1c8..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.svg b/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.svg
deleted file mode 100644
index cccb797ba4..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/calculator-web.svg
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.45.1"
- sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\calculator-webapp-ws"
- sodipodi:docname="calculator-web.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Tuscany\java-head\sca\samples\calculator-webapp-ws\calculator-web.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs4">
- <marker
- inkscape:stockid="Arrow1Lend"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="Arrow1Lend"
- style="overflow:visible;">
- <path
- id="path4252"
- d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
- transform="scale(0.8) rotate(180) translate(12.5,0)" />
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="330.5192"
- inkscape:cy="378.84265"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="59"
- inkscape:window-y="79" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(1,0,0,1.144214,0,-27.53557)">
- <rect
- rx="15.307091"
- ry="12.692303"
- y="192.00233"
- x="258.31146"
- height="299.99988"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">Calculator</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="191.57716"
- x="339.91632"
- y="262.1673"
- rx="6.9961648"
- ry="15.892869" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(79.61125,62.65764)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Calculator</flowPara><flowPara
- id="flowPara1895">Service</flowPara><flowPara
- id="flowPara1897">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
- id="path3019" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
- id="path1883" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1885"
- transform="translate(-46.16225,128.7269)"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
- id="flowRegion1887"><rect
- id="rect1889"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
- id="flowPara1891">Calculator</flowPara><flowPara
- id="flowPara1893">Service</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1899"
- width="115.66247"
- height="70.148659"
- x="594.75488"
- y="209.73451"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1901"
- transform="translate(334.4498,10.22481)"><flowRegion
- id="flowRegion1903"><rect
- id="rect1905"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1907">Add</flowPara><flowPara
- id="flowPara1909">Service</flowPara><flowPara
- id="flowPara1911">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
- id="path1913" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1917"
- width="115.66247"
- height="70.148659"
- x="594.06543"
- y="292.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1919"
- transform="translate(333.7604,93.08188)"><flowRegion
- id="flowRegion1921"><rect
- id="rect1923"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1925">Subtract</flowPara><flowPara
- id="flowPara1927">Service</flowPara><flowPara
- id="flowPara1929">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
- id="path1931" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1933"
- width="115.66247"
- height="70.148659"
- x="594.77979"
- y="371.87729"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1935"
- transform="translate(334.4747,172.3676)"><flowRegion
- id="flowRegion1937"><rect
- id="rect1939"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1941">Multiply</flowPara><flowPara
- id="flowPara1943">Service</flowPara><flowPara
- id="flowPara1945">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
- id="path1947" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1949"
- width="115.66247"
- height="70.148659"
- x="596.20831"
- y="452.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1951"
- transform="translate(335.9032,253.0819)"><flowRegion
- id="flowRegion1953"><rect
- id="rect1955"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1957">Divide</flowPara><flowPara
- id="flowPara1959">Service</flowPara><flowPara
- id="flowPara1961">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
- id="path1963" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1965"
- transform="translate(161.0221,114.967)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1967"><rect
- id="rect1969"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1973">add</flowPara><flowPara
- id="flowPara1977">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
- id="path1979" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1981"
- transform="translate(160.6632,150.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1983"><rect
- id="rect1985"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1987">subtract</flowPara><flowPara
- id="flowPara1989">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
- id="path1991" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1993"
- transform="translate(161.3775,184.2583)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1995"><rect
- id="rect1997"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1999">multiply</flowPara><flowPara
- id="flowPara2001">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
- id="path2003" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2005"
- transform="translate(159.9489,215.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2007"><rect
- id="rect2009"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2011">divide</flowPara><flowPara
- id="flowPara2013">Service</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:4,1;stroke-dashoffset:0"
- d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
- id="path2015" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
- id="path2017" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
- id="path2019" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
- id="path2021" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 292.85714,355.52305 L 330,354.80877"
- id="path2023" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
- id="path1950"
- sodipodi:cx="179.28572"
- sodipodi:cy="352.66592"
- sodipodi:rx="32.857143"
- sodipodi:ry="35"
- d="M 197.59435,323.60313 A 32.857143,35 0 1 1 196.81963,323.06603"
- sodipodi:start="5.3034219"
- sodipodi:end="11.558474"
- sodipodi:open="true"
- transform="translate(-11.428568,5.714286)" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1952"
- transform="translate(-134.69216,137.10973)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1954"><rect
- id="rect1956"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1960">calc.jsp</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 235,356.23734 C 200.71429,356.23734 200.71429,356.23734 200.71429,356.23734"
- id="path1972" />
- <rect
- style="opacity:0.21666667;fill:#3d2020;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:4, 1;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2246"
- width="56.428566"
- height="317.85715"
- x="57.14286"
- y="206.95161"
- rx="4.7646294"
- ry="7.7766709" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3221"
- transform="translate(-214.7771,5.7407504)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion3223"><rect
- id="rect3225"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara3227">App</flowPara><flowPara
- id="flowPara3229">Server</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot3231"
- transform="translate(232.36576,64.312179)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion3233"><rect
- id="rect3235"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara3237">SOAP</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot3239"
- transform="translate(249.50862,136.45504)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion3241"><rect
- id="rect3243"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara3245">local</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot3247"
- transform="translate(247.27783,197.54805)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion3249"><rect
- id="rect3251"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara3253">local</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot3255"
- transform="translate(235.13497,276.11948)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion3257"><rect
- id="rect3259"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara3261">local</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
- d="M 113.57143,238.80877 L 575.71429,238.80877"
- id="path3263" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 112.85714,359.09448 C 135.71429,359.09448 135.71429,359.09448 135.71429,359.09448"
- id="path3265" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
- d="M 478.57143,334.09448 C 499.28571,291.95163 505.71429,287.66591 498.57143,273.3802 C 491.42857,259.09448 477.85714,254.09448 470.71429,253.3802 C 463.57143,252.66591 14.285714,252.66591 14.285714,252.66591 L 13.571429,234.09448 L 57.857143,234.80877"
- id="path4244" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/pom.xml b/branches/sca-java-0.99/samples/calculator-webapp-ws/pom.xml
deleted file mode 100644
index 0b89ecbfa6..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-calculator-webapp-ws</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany Calculator Sample WebApp With WebServices</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
-
- <!--dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tools-registry-inspector</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency-->
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-http-jetty</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddService.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddService.java
deleted file mode 100644
index c3c789e745..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package calculator;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the add service
- */
-@Remotable
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index a7049729f7..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/AddServiceImpl.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 calculator;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of the Add service
- */
-@Service(AddService.class)
-public class AddServiceImpl implements AddService {
-
- public double add(double n1, double n2) {
- System.err.println("Adding " + n1 + " to " + n2);
- return n1 + n2;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 4787b728f4..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorClient.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 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
- *
- * (not really necessary as this sample runs in a webapp)
- */
-public class CalculatorClient {
- public static void main(String[] args) throws Exception {
-
- SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
- CalculatorService calculatorService =
- scaDomain.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));
-
- scaDomain.close();
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/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-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index bf3b0303ec..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 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-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideService.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/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 interface for the divide service
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/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-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyService.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/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-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/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-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractService.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/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 subtract service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/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-0.99/samples/calculator-webapp-ws/src/main/resources/Calculator.composite b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
deleted file mode 100644
index ce64b086ca..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" >
- <interface.java interface="calculator.AddService" />
- <binding.ws wsdlElement="http://calculator#wsdl.port(AddService/AddSoapPort)"/>
- </reference>
- <reference name="subtractService" target="SubtractServiceComponent"></reference>
- <reference name="multiplyService" target="MultiplyServiceComponent"></reference>
- <reference name="divideService" target="DivideServiceComponent"></reference>
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- <service name="AddService">
- <interface.java interface="calculator.AddService" />
- <!--interface.wsdl interface="http://calculator#wsdl.interface(Add)" /-->
- <binding.ws wsdlElement="http://calculator#wsdl.port(AddService/AddSoapPort)"/>
- </service>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-
- <!--component name="ExtensionPointRegistryInspectorComponent">
- <implementation.java class="org.apache.tuscany.sca.tools.registryinspector.inspector.ExtensionPointRegistryInspectorImpl"/>
- </component-->
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl
deleted file mode 100644
index 40a3d873d3..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/resources/wsdl/add.wsdl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<wsdl:definitions targetNamespace="http://calculator"
- xmlns:tns="http://calculator"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="add">
-
- <wsdl:types>
- <schema elementFormDefault="qualified"
- targetNamespace="http://calculator"
- xmlns="http://www.w3.org/2001/XMLSchema">
-
- <element name="add">
- <complexType>
- <sequence>
- <element name="n1" type="xsd:double"/>
- <element name="n2" type="xsd:double"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="addResponse">
- <complexType>
- <sequence>
- <element name="response" type="xsd:double"/>
- </sequence>
- </complexType>
- </element>
-
- </schema>
- </wsdl:types>
-
- <wsdl:message name="addRequest">
- <wsdl:part element="tns:add" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="addResponse">
- <wsdl:part element="tns:addResponse" name="parameters"/>
- </wsdl:message>
-
- <wsdl:portType name="Add">
- <wsdl:operation name="add">
- <wsdl:input message="tns:addRequest" name="addRequest"/>
- <wsdl:output message="tns:addResponse" name="addResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="AddSoapBinding" type="tns:Add">
- <wsdlsoap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="add">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="addRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="addResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="AddService">
- <wsdl:port binding="tns:AddSoapBinding" name="AddSoapPort">
- <wsdlsoap:address location="http://localhost:8080/sample-calculator-webapp-ws/services/AddService"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index fe09ab2e1b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index c9cde16f84..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>Tuscany Calculator Web Service Sample</display-name>
-
- <listener>
- <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>TuscanyServlet</servlet-name>
- <servlet-class>org.apache.tuscany.sca.host.webapp.TuscanyServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TuscanyServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>calc.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/calc.jsp b/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/calc.jsp
deleted file mode 100644
index 375116e5de..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp-ws/src/main/webapp/calc.jsp
+++ /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.
---%>
-
-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>
-<%@ page import="calculator.CalculatorService" %>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
- SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
- CalculatorService calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-%>
-<html>
-<head><title>Calculator sample</title></head>
-
-<body>
-<table>
- <tr>
- <th>Expression</th><th>Result</th>
- </tr>
- <tr>
- <td>2 + 3</td><td><%= calculatorService.add(2, 3) %></td>
- </tr>
- <tr>
- <td>3 - 2</td><td><%= calculatorService.subtract(3, 2) %></td>
- </tr>
- <tr>
- <td>3 * 2</td><td><%= calculatorService.multiply(3, 2) %></td>
- </tr>
- <tr>
- <td>3 / 2</td><td><%= calculatorService.divide(3, 2) %></td>
- </tr>
-</table>
-</body>
-</html>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/README b/branches/sca-java-0.99/samples/calculator-webapp/README
deleted file mode 100644
index c88b92b206..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/README
+++ /dev/null
@@ -1,118 +0,0 @@
-Calculator Sample
-=================
-This sample uses the same code as the calculator sample but deploys the
-sample wrapped in a web app.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want
-to give this sample a go deploy the WAR file (target/sample-calculator-webapp.war)
-to you web application server.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-calculator-webapp/calc.jsp
-
-The port and hostname will of course vary depending on your local installation.
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java)
-binding. The CalculatorClient exercises this interface by calling add,
-subtract, multiply and divide operations. This results in messages passing to
-the appropriate components in the composite across the local wires.
-
-calculator-webapp/
- src/
- main/
- java/
- calculator/
- CalculatorService.java - As calculator sample
- CalculatorServiceImpl.java
- AddService.java - As calculator sample
- AddServiceImpl.java
- SubtractService.java - As calculator sample
- SubtractServiceImpl.java
- MultiplyService.java - As calculator sample
- MultiplyServiceImpl.java
- DivideService.java - As calculator sample
- DivideServiceImpl.java
- CalculatorClient.java - As calculator sample
- resources/
- Calculator.composite - As calculator sample
- webapp
- META-INF/
- sca-contribution.xml - specifies the composite to be deployed
- WEB-INF/
- web.xml - defines the listener that starts up the
- Tuscany SCA runtime
- calc.jsp - the web application that makes use of the
- SCA application
- test/
- java/
- calculator/
- CalculatorTestCase.java - JUnit test case
-
- calculator.png - a pictorial representation of the sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as
-follows
-
-cd calculator-webapp
-ant package
-
-This should result in a war file (sample-calculator-webapp.war) in the target
-directory. Copy this war file to your web app deployment directory in you
-web app container.
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-calculator-webapp/calc.jsp
-
-The port and hostname will of course vary depending on your local installation.
-
-You should see the following output.
-
-Expression Result
-2 + 3 5.0
-3 - 2 1.0
-3 * 2 6.0
-3 / 2 1.5
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd calculator-webapp
-mvn
-
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.852 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-Again this should result in a war file (sample-calculator-webapp.war) in the target
-directory. Follow the steps described in the previous section for running the web
-app and for the expected results.
-
-
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/build.xml b/branches/sca-java-0.99/samples/calculator-webapp/build.xml
deleted file mode 100644
index 3a39fe015c..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/build.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="calculator-web" default="package">
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- </target>
-
- <target name="package" depends="compile">
- <war destfile="target/sample-calculator-webapp.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <zipfileset dir="../../modules" prefix="WEB-INF/lib">
- <include name="sca-api-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-distributed-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-0.99-incubating-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="../../lib">
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- </lib>
- <classes dir="target/classes"/>
- </war>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.png b/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.png
deleted file mode 100644
index 896ddc4093..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.svg b/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.svg
deleted file mode 100644
index 00ed27556f..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/calculator-web.svg
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-web"
- sodipodi:docname="calculator-web.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-web\calculator-web.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="471.80491"
- inkscape:cy="378.84265"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="59"
- inkscape:window-y="79" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(1,0,0,1.144214,0,-27.53557)">
- <rect
- rx="15.307091"
- ry="12.692303"
- y="192.00233"
- x="258.31146"
- height="299.99988"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">Calculator</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="191.57716"
- x="339.91632"
- y="262.1673"
- rx="6.9961648"
- ry="15.892869" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(79.61125,62.65764)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Calculator</flowPara><flowPara
- id="flowPara1895">Service</flowPara><flowPara
- id="flowPara1897">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
- id="path3019" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
- id="path1883" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1885"
- transform="translate(-46.16225,128.7269)"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
- id="flowRegion1887"><rect
- id="rect1889"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
- id="flowPara1891">Calculator</flowPara><flowPara
- id="flowPara1893">Service</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1899"
- width="115.66247"
- height="70.148659"
- x="594.75488"
- y="209.73451"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1901"
- transform="translate(334.4498,10.22481)"><flowRegion
- id="flowRegion1903"><rect
- id="rect1905"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1907">Add</flowPara><flowPara
- id="flowPara1909">Service</flowPara><flowPara
- id="flowPara1911">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
- id="path1913" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1917"
- width="115.66247"
- height="70.148659"
- x="594.06543"
- y="292.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1919"
- transform="translate(333.7604,93.08188)"><flowRegion
- id="flowRegion1921"><rect
- id="rect1923"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1925">Subtract</flowPara><flowPara
- id="flowPara1927">Service</flowPara><flowPara
- id="flowPara1929">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
- id="path1931" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1933"
- width="115.66247"
- height="70.148659"
- x="594.77979"
- y="371.87729"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1935"
- transform="translate(334.4747,172.3676)"><flowRegion
- id="flowRegion1937"><rect
- id="rect1939"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1941">Multiply</flowPara><flowPara
- id="flowPara1943">Service</flowPara><flowPara
- id="flowPara1945">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
- id="path1947" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1949"
- width="115.66247"
- height="70.148659"
- x="596.20831"
- y="452.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1951"
- transform="translate(335.9032,253.0819)"><flowRegion
- id="flowRegion1953"><rect
- id="rect1955"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1957">Divide</flowPara><flowPara
- id="flowPara1959">Service</flowPara><flowPara
- id="flowPara1961">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
- id="path1963" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1965"
- transform="translate(161.0221,114.967)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1967"><rect
- id="rect1969"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1973">add</flowPara><flowPara
- id="flowPara1977">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
- id="path1979" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1981"
- transform="translate(160.6632,150.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1983"><rect
- id="rect1985"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1987">subtract</flowPara><flowPara
- id="flowPara1989">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
- id="path1991" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1993"
- transform="translate(161.3775,184.2583)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1995"><rect
- id="rect1997"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1999">multiply</flowPara><flowPara
- id="flowPara2001">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
- id="path2003" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2005"
- transform="translate(159.9489,215.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2007"><rect
- id="rect2009"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2011">divide</flowPara><flowPara
- id="flowPara2013">Service</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
- id="path2015" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
- id="path2017" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
- id="path2019" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
- id="path2021" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 292.85714,355.52305 L 330,354.80877"
- id="path2023" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
- id="path1950"
- sodipodi:cx="179.28572"
- sodipodi:cy="352.66592"
- sodipodi:rx="32.857143"
- sodipodi:ry="35"
- d="M 197.59435,323.60313 A 32.857143,35 0 1 1 196.81963,323.06603"
- sodipodi:start="5.3034219"
- sodipodi:end="11.558474"
- sodipodi:open="true"
- transform="translate(-12.85714,0.714286)" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1952"
- transform="translate(-142.5493,128.5383)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1954"><rect
- id="rect1956"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1960">WebApp</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 235,356.23734 C 200.71429,356.23734 200.71429,356.23734 200.71429,356.23734"
- id="path1972" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/pom.xml b/branches/sca-java-0.99/samples/calculator-webapp/pom.xml
deleted file mode 100644
index b851144656..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-calculator-webapp</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany Calculator Sample WebApp</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddService.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddService.java
deleted file mode 100644
index ec57a6a533..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/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 interface for the add service
- */
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/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-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 4787b728f4..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.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 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
- *
- * (not really necessary as this sample runs in a webapp)
- */
-public class CalculatorClient {
- public static void main(String[] args) throws Exception {
-
- SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
- CalculatorService calculatorService =
- scaDomain.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));
-
- scaDomain.close();
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ad87375529..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/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-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index bf3b0303ec..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package 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-0.99/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 835e4fda6d..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/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 interface for the divide service
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/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-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index db568cc762..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/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-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/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-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 30e4e6a56a..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/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 subtract service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-0.99/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/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-0.99/samples/calculator-webapp/src/main/resources/Calculator.composite b/branches/sca-java-0.99/samples/calculator-webapp/src/main/resources/Calculator.composite
deleted file mode 100644
index 50c23af0b2..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent"></reference>
- <reference name="subtractService" target="SubtractServiceComponent"></reference>
- <reference name="multiplyService" target="MultiplyServiceComponent"></reference>
- <reference name="divideService" target="DivideServiceComponent"></reference>
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index fe09ab2e1b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a37b430860..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>Tuscany Calculator Web Service Sample</display-name>
-
- <listener>
- <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
- </listener>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>calc.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/calc.jsp b/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/calc.jsp
deleted file mode 100644
index 375116e5de..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/src/main/webapp/calc.jsp
+++ /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.
---%>
-
-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>
-<%@ page import="calculator.CalculatorService" %>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
- SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
- CalculatorService calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
-%>
-<html>
-<head><title>Calculator sample</title></head>
-
-<body>
-<table>
- <tr>
- <th>Expression</th><th>Result</th>
- </tr>
- <tr>
- <td>2 + 3</td><td><%= calculatorService.add(2, 3) %></td>
- </tr>
- <tr>
- <td>3 - 2</td><td><%= calculatorService.subtract(3, 2) %></td>
- </tr>
- <tr>
- <td>3 * 2</td><td><%= calculatorService.multiply(3, 2) %></td>
- </tr>
- <tr>
- <td>3 / 2</td><td><%= calculatorService.divide(3, 2) %></td>
- </tr>
-</table>
-</body>
-</html>
diff --git a/branches/sca-java-0.99/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java b/branches/sca-java-0.99/samples/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index 4ce3acf46a..0000000000
--- a/branches/sca-java-0.99/samples/calculator-webapp/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 SCADomain scaDomain;
- private CalculatorService calculatorService;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("Calculator.composite");
- calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
- }
-
- @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-0.99/samples/calculator/README b/branches/sca-java-0.99/samples/calculator/README
deleted file mode 100644
index ceb532faed..0000000000
--- a/branches/sca-java-0.99/samples/calculator/README
+++ /dev/null
@@ -1,97 +0,0 @@
-Calculator Sample
-=================
-This sample implements a simple calculator using SCA components.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java)
-binding. The CalculatorClient exercises this interface by calling add,
-subtract, multiply and divide operations. This results in messages passing to
-the appropriate components in the composite across the local wires.
-
-calculator/
- src/
- main/
- java/
- calculator/
- CalculatorService.java - the first component, calls +-/* as
- appropriate
- CalculatorServiceImpl.java
- AddService.java - adds two numbers
- AddServiceImpl.java
- SubtractService.java - subtracts one number from another
- SubtractServiceImpl.java
- MultiplyService.java - multiplies two numbers
- MultiplyServiceImpl.java
- DivideService.java - divides one number by another
- DivideServiceImpl.java
- CalculatorClient.java - starts the SCA Runtime and
- deploys the Calculator.composite.
- It then calls the deployed Calculator
- Components services
- resources/
- Calculator.composite - the SCA assembly for this sample
- test/
- java/
- calculator/
- CalculatorTestCase.java - JUnit test case
- calculator.png - a pictorial representation of the sample
- .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd calculator
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] 3 + 2=5.0
- [java] 3 - 2=1.0
- [java] 3 * 2=6.0
- [java] 3 / 2=1.5
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd calculator
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/calculator/build.xml b/branches/sca-java-0.99/samples/calculator/build.xml
deleted file mode 100644
index c4b755ef94..0000000000
--- a/branches/sca-java-0.99/samples/calculator/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="calculator" default="compile">
- <property name="test.class" value="calculator.CalculatorClient" />
- <property name="test.jar" value="sample-calculator.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator/calculator.png b/branches/sca-java-0.99/samples/calculator/calculator.png
deleted file mode 100644
index 995a57b1fd..0000000000
--- a/branches/sca-java-0.99/samples/calculator/calculator.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/calculator/calculator.svg b/branches/sca-java-0.99/samples/calculator/calculator.svg
deleted file mode 100644
index 0615925c50..0000000000
--- a/branches/sca-java-0.99/samples/calculator/calculator.svg
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator"
- sodipodi:docname="calculator.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator\calculator.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="471.80491"
- inkscape:cy="378.84265"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="59"
- inkscape:window-y="79" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(1,0,0,1.144214,0,-27.53557)">
- <rect
- rx="15.307091"
- ry="12.692303"
- y="192.00233"
- x="258.31146"
- height="299.99988"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">Calculator</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="191.57716"
- x="339.91632"
- y="262.1673"
- rx="6.9961648"
- ry="15.892869" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(79.61125,62.65764)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Calculator</flowPara><flowPara
- id="flowPara1895">Service</flowPara><flowPara
- id="flowPara1897">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
- id="path3019" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
- id="path1883" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1885"
- transform="translate(-46.16225,128.7269)"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
- id="flowRegion1887"><rect
- id="rect1889"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
- id="flowPara1891">Calculator</flowPara><flowPara
- id="flowPara1893">Service</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1899"
- width="115.66247"
- height="70.148659"
- x="594.75488"
- y="209.73451"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1901"
- transform="translate(334.4498,10.22481)"><flowRegion
- id="flowRegion1903"><rect
- id="rect1905"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1907">Add</flowPara><flowPara
- id="flowPara1909">Service</flowPara><flowPara
- id="flowPara1911">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
- id="path1913" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1917"
- width="115.66247"
- height="70.148659"
- x="594.06543"
- y="292.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1919"
- transform="translate(333.7604,93.08188)"><flowRegion
- id="flowRegion1921"><rect
- id="rect1923"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1925">Subtract</flowPara><flowPara
- id="flowPara1927">Service</flowPara><flowPara
- id="flowPara1929">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
- id="path1931" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1933"
- width="115.66247"
- height="70.148659"
- x="594.77979"
- y="371.87729"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1935"
- transform="translate(334.4747,172.3676)"><flowRegion
- id="flowRegion1937"><rect
- id="rect1939"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1941">Multiply</flowPara><flowPara
- id="flowPara1943">Service</flowPara><flowPara
- id="flowPara1945">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
- id="path1947" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1949"
- width="115.66247"
- height="70.148659"
- x="596.20831"
- y="452.59158"
- rx="6.9961648"
- ry="5.8193965" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1951"
- transform="translate(335.9032,253.0819)"><flowRegion
- id="flowRegion1953"><rect
- id="rect1955"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1957">Divide</flowPara><flowPara
- id="flowPara1959">Service</flowPara><flowPara
- id="flowPara1961">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
- id="path1963" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1965"
- transform="translate(161.0221,114.967)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1967"><rect
- id="rect1969"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1973">add</flowPara><flowPara
- id="flowPara1977">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
- id="path1979" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1981"
- transform="translate(160.6632,150.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1983"><rect
- id="rect1985"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1987">subtract</flowPara><flowPara
- id="flowPara1989">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
- id="path1991" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1993"
- transform="translate(161.3775,184.2583)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1995"><rect
- id="rect1997"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1999">multiply</flowPara><flowPara
- id="flowPara2001">Service</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
- id="path2003" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2005"
- transform="translate(159.9489,215.6868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2007"><rect
- id="rect2009"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2011">divide</flowPara><flowPara
- id="flowPara2013">Service</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
- id="path2015" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
- id="path2017" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
- id="path2019" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
- id="path2021" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 292.85714,355.52305 L 330,354.80877"
- id="path2023" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/calculator/pom.xml b/branches/sca-java-0.99/samples/calculator/pom.xml
deleted file mode 100644
index 0d652f5622..0000000000
--- a/branches/sca-java-0.99/samples/calculator/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-calculator</artifactId>
- <name>Apache Tuscany Calculator Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddService.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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-0.99/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 8b6fe066a6..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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-0.99/samples/calculator/src/main/java/calculator/CalculatorClient.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 9d180bf52e..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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");
-
- // 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-0.99/samples/calculator/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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-0.99/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 3d861f2018..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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-0.99/samples/calculator/src/main/java/calculator/DivideService.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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-0.99/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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-0.99/samples/calculator/src/main/java/calculator/MultiplyService.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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-0.99/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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-0.99/samples/calculator/src/main/java/calculator/SubtractService.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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-0.99/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-0.99/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 77b128ab8d..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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-0.99/samples/calculator/src/main/resources/Calculator.composite b/branches/sca-java-0.99/samples/calculator/src/main/resources/Calculator.composite
deleted file mode 100644
index 90872041b0..0000000000
--- a/branches/sca-java-0.99/samples/calculator/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent" />
- <reference name="subtractService" target="SubtractServiceComponent" />
- <reference name="multiplyService" target="MultiplyServiceComponent" />
- <reference name="divideService" target="DivideServiceComponent" />
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/branches/sca-java-0.99/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index a5735a8701..0000000000
--- a/branches/sca-java-0.99/samples/calculator/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");
- }
-
- @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-0.99/samples/chat-webapp/README b/branches/sca-java-0.99/samples/chat-webapp/README
deleted file mode 100644
index dddd7e3f94..0000000000
--- a/branches/sca-java-0.99/samples/chat-webapp/README
+++ /dev/null
@@ -1,61 +0,0 @@
-Chat WebApp Sample
-==================
-This sample demonstrates the SCA DWR binding to implement the classic Ajax sample
-of a chat application which allows multiple users to chat from their browsers.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want
-to give this sample a go deploy the WAR file (target/sample-chat-webapp.war)
-to your web application server.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-chat-webapp
-
-The port and hostname will of course vary depending on your local installation.
-
-Sample Overview
----------------
-The sample provides an SCA component which has an SCA service using the SCA DWR
-binding and an SCA reference also using the DWR binding. The component implementation
-simply forwards every invocation of the service as an invocation on the reference. The
-component reference is scoped by the composite so every active client of the composite
-will receive every message sent to the component service, thus implementing the chat
-application with very little code.
-
-chat-webapp/
- src/
- main/
- java/
- sample/
- ChatService.java - service interface
- ChatServiceImpl.java - service implementation
- resources/
- chat.composite - the SCA assembly for this sample
- webapp
- chat.html - the html UserInterface for this application
- META-INF/
- sca-contribution.xml - specifies the composite to be deployed
- WEB-INF/
- web.xml - defines the listener that starts up the
- Tuscany SCA runtime
-
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd chat-webapp
-mvn
-
-Again this should result in a war file (sample-chat-webapp.war) in the target
-directory. Follow the steps described in the previous section for running the web
-app and for the expected results.
-
-
diff --git a/branches/sca-java-0.99/samples/chat-webapp/build.xml b/branches/sca-java-0.99/samples/chat-webapp/build.xml
deleted file mode 100644
index 1fba79520f..0000000000
--- a/branches/sca-java-0.99/samples/chat-webapp/build.xml
+++ /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.
--->
-<project name="sample-chat-webapp" default="package">
- <property file="${user.home}/tuscany/build.properties" />
- <property file="${user.home}/build.properties" />
-
- <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
- <property name="tuscany.sca.lib.location" value="../../lib"/>
- <property name="tuscany.sca.modules.location" value="../../modules"/>
-
- <path id="project.classpath">
- <pathelement path="target/classes"/>
- <pathelement path="target/sdo-source"/>
- <pathelement location="${tuscany.sca.manifest.location}"/>
- </path>
-
- <target name="init">
- <mkdir dir="target/classes"/>
- <mkdir dir="target/sdo-source"/>
- </target>
-
-
- <target name="compile" depends="init">
- <javac destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <src location="src/main/java"/>
- <src location="target/sdo-source"/>
- <classpath refid="project.classpath"/>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- <fileset dir="target/sdo-source"/>
- </copy>
- </target>
-
- <target name="package" depends="compile">
- <war destfile="target/sample-chat-webapp.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">
- <include name="sca-api-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-dwr-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-feed-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-axis2-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-axiom-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-jaxb-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-sdo-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-distributed-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-extension-helper-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-runtime-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-0.99-incubating-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="${tuscany.sca.lib.location}">
- <include name="XmlSchema-1.3.1.jar"/>
- <include name="activation-1.1.jar"/>
- <include name="annogen-0.1.0.jar"/>
- <include name="ant-1.7.0.jar"/>
- <include name="ant-launcher-1.7.0.jar"/>
- <include name="axiom-api-1.2.4.jar"/>
- <include name="axiom-dom-1.2.4.jar"/>
- <include name="axiom-impl-1.2.4.jar"/>
- <include name="axis2-java2wsdl-1.2.jar"/>
- <include name="axis2-kernel-1.2.jar"/>
- <include name="backport-util-concurrent-2.2.jar"/>
- <include name="backport-util-concurrent-3.0.jar"/>
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="common-2.2.3.jar"/>
- <include name="commons-codec-1.3.jar"/>
- <include name="commons-fileupload-1.1.1.jar"/>
- <include name="commons-httpclient-3.0.1.jar"/>
- <include name="commons-io-1.1.jar"/>
- <include name="commons-logging-1.1.jar"/>
- <include name="dwr-2.0.1.jar"/>
- <include name="ecore-2.2.3.jar"/>
- <include name="ecore-change-2.2.3.jar"/>
- <include name="ecore-xmi-2.2.3.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="geronimo-jms_1.1_spec-1.1.jar"/>
- <include name="jakarta-httpcore-4.0-alpha4.jar"/>
- <include name="jaxb-api-2.1.jar"/>
- <include name="jaxb-impl-2.1.4.jar"/>
- <include name="jaxen-1.1-beta-9.jar"/>
- <include name="jaxws-api-2.1.jar"/>
- <include name="jdom-1.0.jar"/>
- <include name="json-rpc-1.0.jar"/>
- <include name="jsr181-api-1.0-MR1.jar"/>
- <include name="jsr250-api-1.0.jar"/>
- <include name="mail-1.4.jar"/>
- <include name="neethi-2.0.1.jar"/>
- <include name="rome-0.9.jar"/>
- <include name="saaj-api-1.3.jar"/>
- <include name="stax-api-1.0-2.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="woden-1.0-incubating-M7a.jar"/>
- <include name="wsdl4j-1.6.2.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- <include name="xercesImpl-2.8.1.jar"/>
- <include name="xml-apis-1.3.03.jar"/>
- <include name="xsd-2.2.3.jar"/>
- <include name="tuscany-sdo-api-r2.1-1.0-incubating.jar"/>
- <include name="tuscany-sdo-impl-1.0-incubating.jar"/>
- <include name="tuscany-sdo-lib-1.0-incubating.jar"/>
- </lib>
- <classes dir="target/classes"/>
- <classes dir="target/sdo-source"/>
- </war>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/chat-webapp/pom.xml b/branches/sca-java-0.99/samples/chat-webapp/pom.xml
deleted file mode 100644
index 7b749de6ae..0000000000
--- a/branches/sca-java-0.99/samples/chat-webapp/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-chat-webapp</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany Chat Sample WebApp</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-dwr</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatService.java b/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatService.java
deleted file mode 100644
index 1fb9d292cd..0000000000
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package sample;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-@Service
-@Remotable
-public interface ChatService {
-
- public void chat(String msg);
-
-}
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
deleted file mode 100644
index 7d0bfb3307..0000000000
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package sample;
-
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class ChatServiceImpl implements ChatService {
-
- ChatService chatters;
-
- public void chat(String msg) {
- chatters.chat(msg);
- }
-
- public void setChatters(ChatService chatters) {
- this.chatters = chatters;
- }
-}
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/resources/chat.composite b/branches/sca-java-0.99/samples/chat-webapp/src/main/resources/chat.composite
deleted file mode 100644
index c9ce95e2dc..0000000000
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/resources/chat.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Chat">
-
- <service name="ChatService" promote="ChatComponent">
- <interface.java interface="sample.ChatService"/>
- <tuscany:binding.dwr/>
- </service>
-
- <component name="ChatComponent">
- <implementation.java class="sample.ChatServiceImpl"/>
- </component>
-
- <reference name="ChatReference" promote="ChatComponent/chatters">
- <interface.java interface="sample.ChatService" />
- <tuscany:binding.dwr/>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 897849ff8d..0000000000
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:Chat"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 65d486a215..0000000000
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- 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.
- -->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
- <display-name>Tuscany Chat Sample</display-name>
-
- <!-- the Tuscany system listener and servlet -->
- <listener>
- <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>TuscanyServlet</servlet-name>
- <servlet-class>org.apache.tuscany.sca.host.webapp.TuscanyServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TuscanyServlet</servlet-name>
- <url-pattern>/SCA/*</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>chat.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/chat.html b/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/chat.html
deleted file mode 100644
index fc80921e48..0000000000
--- a/branches/sca-java-0.99/samples/chat-webapp/src/main/webapp/chat.html
+++ /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.
--->
-<html>
- <head>
- <title>Tuscany Ajax/DWR Chat Sample</TITLE>
-
- <script type="text/javascript" src="SCA/SCADomain/scaDomain.js"></script>
-
- <script language="JavaScript">
-
- function clickButton(e, buttonid){
- var evt = e ? e : window.event;
- var bt = document.getElementById(buttonid);
- if (bt){
- if (evt.keyCode == 13){
- bt.click();
- return false;
- }
- }
- }
-
- ChatReference.chat = function(msg) {
- var chatLog = document.getElementById('chatLog');
- chatLog.innerHTML = msg + '<br>' + chatLog.innerHTML;
- }
-
- function sendChat() {
- var chatText = document.getElementById("chatText");
- var nickName = document.getElementById("nickName").value;
- var msg = nickName + ": " + chatText.value
- chatText.value = "";
- chatText.focus();
- ChatService.chat(msg);
- }
- </script>
-
- </head>
- <body onLoad="scaDomain.open()">
-
- <h2>Tuscany Ajax/DWR Chat Sample</h2>
-
- A simple client to chat between multiple web browsers:<br><br>
-
- Nickname: <input type="text" id="nickName" size="10"/>
- <br><br>
-
- Enter text: <input type="text" id="chatText" size="80" onkeypress="return clickButton(event,'Send')"/>
- <input type="button" name="Send" value="Send" id="Send" onclick="sendChat()" />
-
- <br><br>
- <div id="chatLog" style="overflow:auto; height:400px; border:1px solid"></div>
-
- </body>
-</html>
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/build.xml b/branches/sca-java-0.99/samples/company-das-webapp/build.xml
deleted file mode 100644
index feef76481b..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<project name="samples" default="compile">
- <property name="mainDir" value="../../.."/>
- <path id="javac.classpath">
- <fileset dir="${mainDir}/lib">
- <include name="tuscany-runtime-incubating-M1.jar"/>
- </fileset>
- </path>
- <path id="java.classpath">
- <fileset dir="${mainDir}/lib">
- <include name="tuscany-runtime-incubating-M1.jar"/>
- </fileset>
- <pathelement path="target/sample-companyweb.jar"/>
- </path>
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java" destdir="target/classes" debug="on" source="1.5" target="1.5">
- <classpath refid="javac.classpath"/>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <war destfile="target/sample-companyweb.war" webxml="src/main/webapp/WEB-INF/web.xml">
- <classes dir="target/classes"/>
- </war>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target" excludes="sample-companyweb-incubating-M1.war"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/db.lck b/branches/sca-java-0.99/samples/company-das-webapp/dastest/db.lck
deleted file mode 100644
index 9f6b4b3d4b..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/db.lck
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log.ctrl b/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log.ctrl
deleted file mode 100644
index edbd775299..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log.ctrl
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log1.dat
deleted file mode 100644
index 7e85ac8e8f..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/log1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/logmirror.ctrl b/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/logmirror.ctrl
deleted file mode 100644
index edbd775299..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/log/logmirror.ctrl
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c10.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c10.dat
deleted file mode 100644
index 5d8ecaa10f..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c10.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c101.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c101.dat
deleted file mode 100644
index 0f79fa7574..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c101.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c111.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c111.dat
deleted file mode 100644
index 39d49e3d19..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c111.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c121.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c121.dat
deleted file mode 100644
index 2a4311779b..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c121.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c130.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c130.dat
deleted file mode 100644
index 64e3c18d62..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c130.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c141.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c141.dat
deleted file mode 100644
index 0632d04164..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c141.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c150.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c150.dat
deleted file mode 100644
index d7541026f6..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c150.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c161.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c161.dat
deleted file mode 100644
index 6673bf1873..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c161.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c171.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c171.dat
deleted file mode 100644
index c2a753cc5d..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c171.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c180.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c180.dat
deleted file mode 100644
index cb9391aed1..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c180.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c191.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c191.dat
deleted file mode 100644
index d3cf1d6364..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c191.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1a1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1a1.dat
deleted file mode 100644
index a7a2d536e9..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1a1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1b1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1b1.dat
deleted file mode 100644
index 19097e69e7..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1b1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1c0.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1c0.dat
deleted file mode 100644
index 359525a31a..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1c0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1d1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1d1.dat
deleted file mode 100644
index 9f257df932..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1d1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1e0.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1e0.dat
deleted file mode 100644
index e43e52fb7f..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1e0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1f1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1f1.dat
deleted file mode 100644
index 7e6ee3b1e0..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c1f1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c20.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c20.dat
deleted file mode 100644
index 1be6390f06..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c20.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c200.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c200.dat
deleted file mode 100644
index b15d56855c..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c200.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c211.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c211.dat
deleted file mode 100644
index 84b0022312..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c211.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c221.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c221.dat
deleted file mode 100644
index 63106a9523..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c221.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c230.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c230.dat
deleted file mode 100644
index 9975f27c1f..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c230.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c241.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c241.dat
deleted file mode 100644
index 835c645a16..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c241.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c251.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c251.dat
deleted file mode 100644
index d3d6adf4fb..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c251.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c260.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c260.dat
deleted file mode 100644
index 8d7333df7d..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c260.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c271.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c271.dat
deleted file mode 100644
index af722f7d73..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c271.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c281.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c281.dat
deleted file mode 100644
index 3972983c2e..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c281.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c290.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c290.dat
deleted file mode 100644
index 31577b8124..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c290.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2a1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2a1.dat
deleted file mode 100644
index 0f700d13a7..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2a1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2b1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2b1.dat
deleted file mode 100644
index 1d6382fb3d..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2b1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2c1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2c1.dat
deleted file mode 100644
index 3bc60d886b..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2c1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2d0.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2d0.dat
deleted file mode 100644
index c542d3c91c..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2d0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2e1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2e1.dat
deleted file mode 100644
index 16abd20b5f..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2e1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2f0.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2f0.dat
deleted file mode 100644
index eb26be5932..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c2f0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c300.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c300.dat
deleted file mode 100644
index 1214f1df4b..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c300.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c31.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c31.dat
deleted file mode 100644
index 18c16f1123..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c31.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c311.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c311.dat
deleted file mode 100644
index 926cbf25b5..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c311.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c320.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c320.dat
deleted file mode 100644
index 07e7bc023c..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c320.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c331.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c331.dat
deleted file mode 100644
index fd827f9dc2..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c331.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c340.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c340.dat
deleted file mode 100644
index ca70319886..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c340.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c351.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c351.dat
deleted file mode 100644
index 8fbe2a527c..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c351.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c360.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c360.dat
deleted file mode 100644
index dcf9c746e1..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c360.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c371.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c371.dat
deleted file mode 100644
index 6f21a840ea..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c371.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c380.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c380.dat
deleted file mode 100644
index b512e8065f..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c380.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c391.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c391.dat
deleted file mode 100644
index 27006e95a1..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c391.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3a0.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3a0.dat
deleted file mode 100644
index 565dca97ac..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3a0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3b1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3b1.dat
deleted file mode 100644
index 36894c9818..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3b1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3c0.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3c0.dat
deleted file mode 100644
index d0c538aede..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3c0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3d1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3d1.dat
deleted file mode 100644
index 65bcec5527..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3d1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3e0.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3e0.dat
deleted file mode 100644
index bdab359420..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3e0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3f1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3f1.dat
deleted file mode 100644
index dc2d278b57..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c3f1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c400.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c400.dat
deleted file mode 100644
index 3072709cec..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c400.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c41.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c41.dat
deleted file mode 100644
index 61086690f2..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c41.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c411.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c411.dat
deleted file mode 100644
index ca551d8249..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c411.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c420.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c420.dat
deleted file mode 100644
index f04de0840e..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c420.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c431.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c431.dat
deleted file mode 100644
index 398b1672cc..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c431.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c440.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c440.dat
deleted file mode 100644
index af259d0872..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c440.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c451.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c451.dat
deleted file mode 100644
index 772a18c658..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c451.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c460.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c460.dat
deleted file mode 100644
index 505428362d..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c460.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c471.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c471.dat
deleted file mode 100644
index 484d0df42d..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c471.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c481.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c481.dat
deleted file mode 100644
index faac073076..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c481.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c490.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c490.dat
deleted file mode 100644
index 7585319d21..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c490.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c4a1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c4a1.dat
deleted file mode 100644
index 4fe8b786e3..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c4a1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c51.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c51.dat
deleted file mode 100644
index 7fc7937b15..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c51.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c60.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c60.dat
deleted file mode 100644
index d1fb08c946..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c60.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c71.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c71.dat
deleted file mode 100644
index d4c2090a3b..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c71.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c81.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c81.dat
deleted file mode 100644
index 38b6ea6520..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c81.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c90.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c90.dat
deleted file mode 100644
index a607a5969c..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/c90.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ca1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ca1.dat
deleted file mode 100644
index 19b4c9e340..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ca1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cb1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cb1.dat
deleted file mode 100644
index 73dc986572..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cb1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cc0.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cc0.dat
deleted file mode 100644
index d1eef3bb56..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cc0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cd1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cd1.dat
deleted file mode 100644
index c7e6db3ef7..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cd1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ce1.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ce1.dat
deleted file mode 100644
index 8fd3bf17a8..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/ce1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cf0.dat b/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cf0.dat
deleted file mode 100644
index 332b3d9a8a..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/seg0/cf0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/dastest/service.properties b/branches/sca-java-0.99/samples/company-das-webapp/dastest/service.properties
deleted file mode 100644
index af9511d9c7..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/dastest/service.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#C:\apacheSVN\java\target\dastest
-# ********************************************************************
-# *** Please do NOT edit this file. ***
-# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
-# ********************************************************************
-#Fri Feb 17 08:55:29 MST 2006
-SysschemasIndex2Identifier=225
-SyscolumnsIdentifier=144
-SysconglomeratesIndex1Identifier=49
-SysconglomeratesIdentifier=32
-SyscolumnsIndex2Identifier=177
-SysschemasIndex1Identifier=209
-SysconglomeratesIndex3Identifier=81
-SystablesIndex2Identifier=129
-SyscolumnsIndex1Identifier=161
-derby.serviceProtocol=org.apache.derby.database.Database
-SysschemasIdentifier=192
-derby.storage.propertiesId=16
-SysconglomeratesIndex2Identifier=65
-derby.serviceLocale=en_US
-SystablesIdentifier=96
-SystablesIndex1Identifier=113
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/pom.xml b/branches/sca-java-0.99/samples/company-das-webapp/pom.xml
deleted file mode 100644
index db6a6426cc..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>sample-company-das-webapp</artifactId>
- <name>Apache Tuscany DAS Data Access Service Web Client Sample</name>
- <packaging>war</packaging>
-
- <dependencies>
-
- <!-- runtime is need for webapp integration to include jar -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- das & sdo -->
- <dependency>
- <groupId>org.apache.tuscany.das</groupId>
- <artifactId>tuscany-das-rdb</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <!-- this will place the java source files inside the war -->
- <build>
- <finalName>${artifactId}</finalName>
- <sourceDirectory>src/main/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/readme.html b/branches/sca-java-0.99/samples/company-das-webapp/readme.html
deleted file mode 100644
index 65a50de320..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/readme.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Tuscany RDB DAS Service client</title>
-
-<style>
-.code {font-size: 11px; color: #006699}
-.codebox {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px}
-.codebox2 {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px; width:85%}
-.codeboxW {border: 1px solid #6699CC; background-color: #FFFFFF;padding:15px}
-.codeboxB {background-color: #C9DBED;padding:1px 10px 10px 10px}
-</style>
-
-</head>
-
-
-
-
-<body>
-
-<h1>Tuscany RDB DAS Service client</h1>
-
-
-<h3>Introduction</h3>
-
-<p>
-This stand-alone sample application demonstrate how to consume the DAS Service exposed trough an SCA service.<br>
-The application starts with a canned database of Companies and their related Departments.<br>
-Through the web page interface, a user can consume the DAS Service to display the list of available companies.<br>
-The sample runs on Tomcat 5.5 and employs a Derby database accessed via a DataSource.
-</p>
-
-
-
-
-
-<h3>Running the sample</h3>
-
-<p>There are two options for running this sample:</p>
-
-<ol>
- <li>Run from Tomcat configured by the build</li>
- <li>Deploying the DASService.client WAR into a Tomcat you configure yourself</li>
-</ol>
-
-
-<h3>Running from Tomcat configured by the build</h3>
-
-<p>
-This sample application is deployed (along with the canned test database) to an instance of Tomcat as part of our automated sample
-testing.This means you can run the java/samples/testing/tomcat build (see java/das/samples/testing/tomcat/readme.htm ) and then access
-the application by pointing your browser to http://localhost:8080/companyweb-service-client/
-</p>
-
-
-
-<h3>Deploying the DASService.client WAR into a Tomcat you configure yourself</h3>
-
-<p>
-Alternatively, you can deploy the sample to your own configured Tomcat installation by following the instructions below.
-These instructions assume that you have either 1) downloaded the Tuscany sample distribution or 2) Downloaded the Tuscany
-source and run our maven build, see the following link to more details steps on how to build DAS Sample applications <a
-href="http://incubator.apache.org/tuscany/java_das_overview.html">http://incubator.apache.org/tuscany/java_das_overview.html</a>.
-</p>
-
-<p><b><u>Set Up:</u></b></p>
-
-
-<ol>
- <li>Download and install the most recent stable version of Tomcat 5.5. You can find it here: <a
- href="http://tomcat.apache.org/download-55.cgi">http://tomcat.apache.org/download-55.cgi</a></li>
- <li>Download the most recent official release of Derby from here: <a href="http://db.apache.org/derby/index.html">http://db.apache.org/derby/index.html</a>.
- The only file you’ll need from this download is derby.jar</li>
- <li>Stop Tomcat</li>
- <li>Copy derby.jar (from the derby distribution) to {Tomcat_Home}/common/lib:</li>
- <li>Add the sample war file to {Tomcat_Home}/webapps</li>
- <ol start=1 type=a>
- <li>sample-das-service-client-xxx.war (e.g.sample-das-service-client-1.0-incubator-SNAPSHOT.war)</li>
- </ol>
- <li>Install the canned Derby database to Tomcat: </li>
- <ol start=1 type=a>
- <li>First, create a new directory named “Databases” to hold the sample database. Create {Tomcat_Home}/Databases</li>
- <li>Copy the <b>dastest</b> folder (and all its contents) from {build directory root OR
- where samples where unzipped}/java/das/samples/DASService.client to {Tomcat_Home}/Databases.<br>
- <br>
- <b>NOTE</b>: If you are running this from a sample distribution, the canned database is available in the
- distribution, inside the databases directory. </li>
- </ol>
- <li>Define a DataSource by adding a datasource definition to {Tomcat_Home}/conf/server.xml.</li>
- <ol start=1 type=a>
- <li>Find the end-of-section marker &lt;/GlobalNamingResources&gt; and add the following lines just above it:
- <p>
- <div class="codebox2">
- <pre>
- &lt;!-- Global Datasource for Derby dastest database --&gt;
- &lt;Resource name="jdbc/dastest"
- type="javax.sql.DataSource" auth="Container"
- description="Derby database for DAS Company sample"
- maxActive="100" maxIdle="30" maxWait="10000"
- username="" password=""
- driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:{absolute path}Databases/dastest"/&gt;
- </pre>
- </div>
- </p>
- <p><b>Requirement</b>:You must include the absolute path to the “Databases” directory in the above url attribute. Fore example:</p>
- <p><pre> url=&quot;jdbc:derby:c:\apache-tomcat-5.5.17\Databases/dastest&quot;</pre></p>
- </li>
- </ol>
- <li><p>Start tomcat and point your browser to: <a href="http://localhost:8080/sample-das-service-client-%7bversion%20tag%7d/">http://localhost:8080/sample-das-service-client-{version
- tag}/</a>. Example:</p>
- <p><pre> http://localhost:8080/sample-das-service-client-1.0-incubator-SNAPSHOT/</pre></p>
-
- </li>
-
-</ol>
-
-
-
-
-<h3>Sample Architecture</h3>
-
-<p>This is a simple, single-page, web application to consume DAS exposed as an SCA service.</p>
-<p>The main components of this application are:</p>
-
-<ul type=disc>
- <li>The SCA DAS Service</li>
- <li>SDO</li>
- <li>Company.jsp</li>
- <li>The canned Derby database</li>
-</ul>
-
-
-<p>The <b>Company.jsp</b> directly invoke the DAS Service to get a list of companies available and then iterate trough the SDO data graphs and manipulate SDO directly to display data</p>
-
-<p>The canned <b>Derby database</b> comes preloaded with Companies and related Departments. The Derby database instance is a simple file folder.</p>
-
-<p>The <b>SCA DAS Service</b> accepts directives (commands) and reads and writes to the derby database instance appropriately using DAS as the service implementation.</p>
-
-
-
-<h3>Consuming the DAS service</h3>
-
-<p>First, note that the application have dependencies on the DAS Service:</p>
-
-
-<p>
-<div class="codebox2">
-<pre>
-&lt;!-- DAS Service --&gt;
-&lt;dependency&gt;
- &lt;groupId&gt;org.apache.tuscany.das.samples&lt;/groupId&gt;
- &lt;artifactId&gt;sample-das-service&lt;/artifactId&gt;
- &lt;version&gt;${pom.version}&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div>
-</p>
-
-<br>
-<p>And the SCDL references the service:</p>
-
-<p>
-<div class="codebox2">
-<pre>
-&lt;composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="DASServiceComposite"&gt;
- &lt;component name="DASServiceComponent"&gt;
- &lt;implementation.composite name="DASServiceComposite" jarLocation="lib/sample-das-service-1.0-incubator-SNAPSHOT.jar"/&gt;
- &lt;/component&gt;
-&lt;/composite&gt;
-</pre>
-</div>
-</p>
-
-
-
-
-</body>
-
-</html>
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASService.java b/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASService.java
deleted file mode 100644
index 0387341b87..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package das;
-
-import java.io.InputStream;
-import java.util.Vector;
-
-import commonj.sdo.DataObject;
-
-public interface DASService {
-
- /**
- * Set DAS configuration file to be used
- * @param configStream
- * @throws DASServiceException
- */
- public void configureService(InputStream configStream) throws DASServiceException;
-
- /**
- * Execute an existing command. The commands are defined in the DAS Configuration file being used by the service
- * @param commandName Command name as it appears on the DAS Configuration file
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject executeCommand(String commandName, Vector commandArguments) throws DASServiceException;
-
- /**
- * Execute a new command, this can be any arbitrary valid query based on the backend implementation (e.g. SQL Query for DAS RDB)
- * @param adHocQuery A new command to be executed (e.g SQL Query)
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject execute(String adHocQuery, Vector commandArguments) throws DASServiceException;
-
- /**
- * Apply all changes on the graph back to the persistent repository.
- * This would save the changes on the SDO ChangeSummary back to the database
- * Note: Your SDO ojects should have been created with ChangeSummary support
- * @param graphRoot SDO Object with changes to be commited to persistent repository
- * @throws DASServiceException
- */
- public void applyChanges(DataObject graphRoot) throws DASServiceException;
-}
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceException.java b/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceException.java
deleted file mode 100644
index e62201a4de..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceException.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 das;
-
-public class DASServiceException extends Exception {
-
- private static final long serialVersionUID = -7514653215235902874L;
-
- public DASServiceException() {
- super();
- }
-
- public DASServiceException(String msg) {
- super(msg);
- }
-
- public DASServiceException(String msg, Throwable ex) {
- super(msg, ex);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java b/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
deleted file mode 100644
index 70d9e379ef..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/java/das/DASServiceImpl.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package das;
-
-import java.io.InputStream;
-import java.util.Vector;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.DAS;
-import org.osoa.sca.annotations.Scope;
-
-import commonj.sdo.DataObject;
-
-@Scope("COMPOSITE")
-public class DASServiceImpl implements DASService {
-
- protected DAS das = null;
-
-
- /**
- * Initialize DAS
- * @return
- * @throws DASServiceException
- */
- private void initDAS(InputStream config) throws DASServiceException {
- if(config == null){
- throw new DASServiceException("Missing configuration information");
- }
-
- if(this.das != null){
- this.das.releaseResources();
- this.das = null;
- }
-
- this.das = DAS.FACTORY.createDAS(config);
- }
-
- /**
- * Get a DAS instance based on the configuration
- * @return
- * @throws DASServiceException
- */
- private DAS getDAS() throws DASServiceException {
- if(this.das == null){
- throw new DASServiceException("DAS not initialized. Please provide DAS configuration torugh das.SetConfig");
- }
-
- return this.das;
- }
-
- /**
- * Set DAS configuration file to be used
- * @param configStream
- * @throws DASServiceException
- */
- public void configureService(InputStream configStream) throws DASServiceException{
- this.initDAS(configStream);
- }
-
-
-
- /**
- * Execute an existing command. The commands are defined in the DAS Configuration file being used by the service
- * @param commandName Command name as it appears on the DAS Configuration file
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject executeCommand(String commandName, Vector commandArguments) throws DASServiceException{
- Command command = this.getDAS().getCommand(commandName);
-
- if(command == null){
- throw new DASServiceException("Invalid command: " + commandName);
- }
-
- //check if arguments was passed
- if(commandArguments != null && commandArguments.size() > 0){
- //we need to set the arguments
- int pos=0;
- for(Object argument : commandArguments){
- pos++;
- command.setParameter(pos, argument);
- }
- }
-
- DataObject root = command.executeQuery();
-
- return root;
- }
-
- /**
- * Execute a new command, this can be any arbitrary valid query based on the backend implementation (e.g. SQL Query for DAS RDB)
- * @param newCommand A new command to be executed (e.g SQL Query)
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject execute(String adHocQuery, Vector commandArguments) throws DASServiceException {
- Command command = this.getDAS().createCommand(adHocQuery);
-
- if(command == null){
- throw new DASServiceException("Invalid command: " + adHocQuery);
- }
-
- //check if arguments was passed
- if(commandArguments != null && commandArguments.size() > 0){
- //we need to set the arguments
- int pos=0;
- for(Object argument : commandArguments){
- pos++;
- command.setParameter(pos, argument);
- }
- }
- DataObject root = command.executeQuery();
-
- return root;
- }
-
- /**
- * Apply all changes on the graph back to the persistent repository.
- * This would save the changes on the SDO ChangeSummary back to the database
- * Note: Your SDO ojects should have been created with ChangeSummary support
- * @throws DASServiceException
- * @param graphRoot SDO Object with changes to be commited to persistent repository
- */
- public void applyChanges(DataObject graphRoot) throws DASServiceException{
- // TODO Auto-generated method stub
-
- }
-}
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/CompanyConfig.xml b/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
deleted file mode 100644
index 3d20054c12..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/CompanyConfig.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <ConnectionInfo dataSource="java:comp/env/jdbc/dastest"/>
-
- <Command name="all companies" SQL="select * from COMPANY" kind="Select"/>
-
- <Command name="all companies and departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID" kind="Select"/>
-
- <Command name="all departments for company" SQL="select * from COMPANY inner join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = ?" kind="Select"/>
-
- <Command name="company by id with departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = ?" kind="Select"/>
-
-
- <Table tableName="COMPANY">
- <Column columnName="ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Table tableName="DEPARTMENT">
- <Column columnName="ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT" many="true">
- <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
- </Relationship>
-
-
-</Config>
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/dasservice.composite b/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/dasservice.composite
deleted file mode 100644
index 54c4af61ee..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/dasservice.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://das-service"
- xmlns:das-service="http://das-service"
- name="DASService">
-
- <service name="DASService" promote="DASServiceComponent">
- <interface.java interface="das.DASService"/>
- <reference>DASServiceComponent</reference>
- </service>
-
- <component name="DASServiceComponent">
- <implementation.java class="das.DASServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/log4j.properties b/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/log4j.properties
deleted file mode 100644
index c5c2868aaa..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/resources/log4j.properties
+++ /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.
-#
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=[DAS RDB] - %c{1}.%M (%L) : %m %n
-
-# Print only messages of level WARN or above in the package com.foo.
-log4j.logger.org.apache.tuscany=NONE \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/Company.jsp b/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/Company.jsp
deleted file mode 100644
index 0a156de1c7..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/Company.jsp
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>
-
-<%@ page import="commonj.sdo.*" %>
-<%@ page import="das.*" %>
-
-<html>
-<head>
-<%@ page language="java" contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
-<%
-
- SCADomain domain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
- if (domain == null) {
- System.out.println("domain == NULL");
- }
-
-
- DASService dasService = domain.getService(DASService.class, "DASServiceComponent");
-
- if (dasService == null) {
- System.out.println("DASService == NULL");
- }
-
- List companyList = null;
-
- try{
- dasService.configureService(getClass().getClassLoader().getResourceAsStream("CompanyConfig.xml"));
- DataObject root = dasService.executeCommand("all companies", null);
- companyList = root.getList("COMPANY");
- }catch(Exception e){
- //TODO: handle case where dasService can't be initiated properly
- }
-
-%>
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>DASService Client Test</title>
-</head>
-<body>
-
-<H2>Tuscany DAS Service WEB Client Application Example</H2>
-
-<!-- Do Fill -->
-<table border>
- <thead>
- <tr>
- <th>ID</th>
- <th>Name</th>
- </tr>
- </thead>
- <tbody>
-
- <%
- java.util.Iterator i = companyList.iterator();
- while (i.hasNext()) {
- DataObject company = (DataObject)i.next();
- %>
- <tr>
- <td><%=company.getInt("ID")%></td>
- <td><%=company.getString("NAME")%></td>
- <tr>
- <%
- }
- %>
- </tbody>
-</table>
-
-
-
-</form>
-</body>
-</html>
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/context.xml b/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/context.xml
deleted file mode 100644
index 0e90eb0a83..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/context.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<Context path="/DAS Stand alone app" debug="5" reloadable="true" crossContext="true">
-
- <Manager pathname=""/>
- <ResourceLink name="jdbc/dastest" global="jdbc/dastest" type="javax.sql.DataSource" />
-
-</Context>
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 25849fa6b9..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:DASService"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 67a782269e..0000000000
--- a/branches/sca-java-0.99/samples/company-das-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-
- <display-name>Tuscany DAS Service Client Application</display-name>
-
- <listener>
- <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
- </listener>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>Company.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-0.99/samples/company-das/pom.xml b/branches/sca-java-0.99/samples/company-das/pom.xml
deleted file mode 100644
index ce1858c19c..0000000000
--- a/branches/sca-java-0.99/samples/company-das/pom.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>sample-company-das</artifactId>
- <name>Apache Tuscany Company Data Access Service Sample</name>
- <packaging>jar</packaging>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sca-api</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.das</groupId>
- <artifactId>tuscany-das-rdb</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.2.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.tuscany.samples.das.service.client.DASServiceClient</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/company-das/readme.html b/branches/sca-java-0.99/samples/company-das/readme.html
deleted file mode 100644
index ec6b492b72..0000000000
--- a/branches/sca-java-0.99/samples/company-das/readme.html
+++ /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.
- -->
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Tuscany RDB DAS exposed as an SCA service</title>
-
-<style>
-.code {font-size: 11px; color: #006699}
-.codebox {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px}
-.codebox2 {border: 1px solid #6699CC; background-color: #F1F7FA;padding:15px; width:85%}
-.codeboxW {border: 1px solid #6699CC; background-color: #FFFFFF;padding:15px}
-.codeboxB {background-color: #C9DBED;padding:1px 10px 10px 10px}
-</style>
-
-</head>
-
-
-
-
-<body>
-
-<h1>Tuscany RDB DAS exposed as an SCA service</h1>
-
-
-<h3>Introduction</h3>
-
-<p>This is a sample SCA service that exposes DAS functionality.</p>
-<p>This service would allow you to utilize DAS in a language neutral fashion, consuming existent or adHoc commands.</p>
-
-
-<h3>Consuming the DAS service</h3>
-
-
-<p>You should add the dependency on your client project pom file</p>
-
-
-<p>
-<div class="codebox2">
-<pre>
-&lt;!-- DAS Service --&gt;
-&lt;dependency&gt;
- &lt;groupId&gt;org.apache.tuscany.das.samples&lt;/groupId&gt;
- &lt;artifactId&gt;sample-das-service&lt;/artifactId&gt;
- &lt;version&gt;${pom.version}&lt;/version&gt;
-&lt;/dependency&gt;
-</pre>
-</div>
-</p>
-
-<br>
-<p>In order to consume the service, you would have to create a SCDL that references it, see sample below:</p>
-
-<p>
-<div class="codebox2">
-<pre>
-&lt;composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="DASServiceComposite"&gt;
- &lt;component name="DASServiceComponent"&gt;
- &lt;implementation.composite name="DASServiceComposite" jarLocation="lib/sample-das-service-1.0-incubator-SNAPSHOT.jar"/&gt;
- &lt;/component&gt;
-&lt;/composite&gt;
-</pre>
-</div>
-</p>
-
-
-<h3>Sample Architecture</h3>
-
-<p>This service utilizes the following Interface as its definition:</p>
-
-
-<p>
-<div class="codebox2">
-<pre>
-
-public interface DASService {
-
- public void configureService(InputStream configStream) throws DASServiceException;
-
- public DataObject executeCommand(String commandName, Vector commandArguments) throws DASServiceException;
-
- public DataObject execute(String adHocQuery, Vector commandArguments) throws DASServiceException;
-
- public void applyChanges(DataObject graphRoot) throws DASServiceException;
-
-}
-</pre>
-</div>
-</p>
-
-</body>
-
-</html>
diff --git a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASService.java b/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASService.java
deleted file mode 100644
index 0387341b87..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package das;
-
-import java.io.InputStream;
-import java.util.Vector;
-
-import commonj.sdo.DataObject;
-
-public interface DASService {
-
- /**
- * Set DAS configuration file to be used
- * @param configStream
- * @throws DASServiceException
- */
- public void configureService(InputStream configStream) throws DASServiceException;
-
- /**
- * Execute an existing command. The commands are defined in the DAS Configuration file being used by the service
- * @param commandName Command name as it appears on the DAS Configuration file
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject executeCommand(String commandName, Vector commandArguments) throws DASServiceException;
-
- /**
- * Execute a new command, this can be any arbitrary valid query based on the backend implementation (e.g. SQL Query for DAS RDB)
- * @param adHocQuery A new command to be executed (e.g SQL Query)
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject execute(String adHocQuery, Vector commandArguments) throws DASServiceException;
-
- /**
- * Apply all changes on the graph back to the persistent repository.
- * This would save the changes on the SDO ChangeSummary back to the database
- * Note: Your SDO ojects should have been created with ChangeSummary support
- * @param graphRoot SDO Object with changes to be commited to persistent repository
- * @throws DASServiceException
- */
- public void applyChanges(DataObject graphRoot) throws DASServiceException;
-}
diff --git a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceException.java b/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceException.java
deleted file mode 100644
index e62201a4de..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceException.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 das;
-
-public class DASServiceException extends Exception {
-
- private static final long serialVersionUID = -7514653215235902874L;
-
- public DASServiceException() {
- super();
- }
-
- public DASServiceException(String msg) {
- super(msg);
- }
-
- public DASServiceException(String msg, Throwable ex) {
- super(msg, ex);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceImpl.java b/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceImpl.java
deleted file mode 100644
index 70d9e379ef..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/main/java/das/DASServiceImpl.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package das;
-
-import java.io.InputStream;
-import java.util.Vector;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.DAS;
-import org.osoa.sca.annotations.Scope;
-
-import commonj.sdo.DataObject;
-
-@Scope("COMPOSITE")
-public class DASServiceImpl implements DASService {
-
- protected DAS das = null;
-
-
- /**
- * Initialize DAS
- * @return
- * @throws DASServiceException
- */
- private void initDAS(InputStream config) throws DASServiceException {
- if(config == null){
- throw new DASServiceException("Missing configuration information");
- }
-
- if(this.das != null){
- this.das.releaseResources();
- this.das = null;
- }
-
- this.das = DAS.FACTORY.createDAS(config);
- }
-
- /**
- * Get a DAS instance based on the configuration
- * @return
- * @throws DASServiceException
- */
- private DAS getDAS() throws DASServiceException {
- if(this.das == null){
- throw new DASServiceException("DAS not initialized. Please provide DAS configuration torugh das.SetConfig");
- }
-
- return this.das;
- }
-
- /**
- * Set DAS configuration file to be used
- * @param configStream
- * @throws DASServiceException
- */
- public void configureService(InputStream configStream) throws DASServiceException{
- this.initDAS(configStream);
- }
-
-
-
- /**
- * Execute an existing command. The commands are defined in the DAS Configuration file being used by the service
- * @param commandName Command name as it appears on the DAS Configuration file
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject executeCommand(String commandName, Vector commandArguments) throws DASServiceException{
- Command command = this.getDAS().getCommand(commandName);
-
- if(command == null){
- throw new DASServiceException("Invalid command: " + commandName);
- }
-
- //check if arguments was passed
- if(commandArguments != null && commandArguments.size() > 0){
- //we need to set the arguments
- int pos=0;
- for(Object argument : commandArguments){
- pos++;
- command.setParameter(pos, argument);
- }
- }
-
- DataObject root = command.executeQuery();
-
- return root;
- }
-
- /**
- * Execute a new command, this can be any arbitrary valid query based on the backend implementation (e.g. SQL Query for DAS RDB)
- * @param newCommand A new command to be executed (e.g SQL Query)
- * @param commandArguments Vector with arguments to be used by the command
- * @throws DASServiceException
- * @return
- */
- public DataObject execute(String adHocQuery, Vector commandArguments) throws DASServiceException {
- Command command = this.getDAS().createCommand(adHocQuery);
-
- if(command == null){
- throw new DASServiceException("Invalid command: " + adHocQuery);
- }
-
- //check if arguments was passed
- if(commandArguments != null && commandArguments.size() > 0){
- //we need to set the arguments
- int pos=0;
- for(Object argument : commandArguments){
- pos++;
- command.setParameter(pos, argument);
- }
- }
- DataObject root = command.executeQuery();
-
- return root;
- }
-
- /**
- * Apply all changes on the graph back to the persistent repository.
- * This would save the changes on the SDO ChangeSummary back to the database
- * Note: Your SDO ojects should have been created with ChangeSummary support
- * @throws DASServiceException
- * @param graphRoot SDO Object with changes to be commited to persistent repository
- */
- public void applyChanges(DataObject graphRoot) throws DASServiceException{
- // TODO Auto-generated method stub
-
- }
-}
diff --git a/branches/sca-java-0.99/samples/company-das/src/main/resources/dasservice.composite b/branches/sca-java-0.99/samples/company-das/src/main/resources/dasservice.composite
deleted file mode 100644
index 42ac52a756..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/main/resources/dasservice.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://das-service"
- xmlns:das-service="http://das-service"
- name="DASService">
-
- <service name="DASService" promote="DASServiceComponent">
- <interface.java interface="das.DASService"/>
- <reference>DASServiceComponent</reference>
- </service>
-
- <component name="DASServiceComponent">
- <implementation.java class="das.DASServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/java/das/DASServiceTestCase.java b/branches/sca-java-0.99/samples/company-das/src/test/java/das/DASServiceTestCase.java
deleted file mode 100644
index 38acde3eb0..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/java/das/DASServiceTestCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package das;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import commonj.sdo.DataObject;
-
-public class DASServiceTestCase extends TestCase {
-
- SCADomain scaDomain;
- private DASService dasService;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("dasservice.composite");
- dasService = scaDomain.getService(DASService.class, "DASServiceComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void testDAS() throws Exception{
- dasService.configureService(getClass().getResourceAsStream("/CompanyConfig.xml"));
- DataObject root = dasService.executeCommand("all companies", null);
- List companyList = root.getList("COMPANY");
-
- assertNotNull(companyList);
- assertEquals(3,companyList.size());
- }
-}
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/CompanyConfig.xml b/branches/sca-java-0.99/samples/company-das/src/test/resources/CompanyConfig.xml
deleted file mode 100644
index 912e81e9f6..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/CompanyConfig.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd">
-
- <ConnectionInfo>
- <ConnectionProperties
- driverClass="org.apache.derby.jdbc.EmbeddedDriver"
- databaseURL="jdbc:derby:target/test-classes/dastest;create=true"
- loginTimeout="600000"/>
- </ConnectionInfo>
-
-
- <Command name="all companies" SQL="select * from COMPANY" kind="Select"/>
-
- <Command name="all companies and departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID" kind="Select"/>
-
- <Command name="all departments for company" SQL="select * from COMPANY inner join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = ?" kind="Select"/>
-
- <Command name="company by id with departments" SQL="select * from COMPANY left outer join DEPARTMENT on COMPANY.ID = DEPARTMENT.COMPANYID where COMPANY.ID = ?" kind="Select"/>
-
-
- <Table tableName="COMPANY">
- <Column columnName="ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Table tableName="DEPARTMENT">
- <Column columnName="ID" primaryKey="true" generated="true"/>
- </Table>
-
- <Relationship name="departments" primaryKeyTable="COMPANY" foreignKeyTable="DEPARTMENT" many="true">
- <KeyPair primaryKeyColumn="ID" foreignKeyColumn="COMPANYID"/>
- </Relationship>
-
-
-</Config>
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/db.lck b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/db.lck
deleted file mode 100644
index 9f6b4b3d4b..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/db.lck
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log.ctrl b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log.ctrl
deleted file mode 100644
index edbd775299..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log.ctrl
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log1.dat
deleted file mode 100644
index 7e85ac8e8f..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/log1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl
deleted file mode 100644
index edbd775299..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/log/logmirror.ctrl
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c10.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c10.dat
deleted file mode 100644
index 5d8ecaa10f..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c10.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c101.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c101.dat
deleted file mode 100644
index 0f79fa7574..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c101.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c111.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c111.dat
deleted file mode 100644
index 39d49e3d19..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c111.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c121.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c121.dat
deleted file mode 100644
index 2a4311779b..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c121.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c130.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c130.dat
deleted file mode 100644
index 64e3c18d62..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c130.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c141.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c141.dat
deleted file mode 100644
index 0632d04164..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c141.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c150.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c150.dat
deleted file mode 100644
index d7541026f6..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c150.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c161.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c161.dat
deleted file mode 100644
index 6673bf1873..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c161.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c171.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c171.dat
deleted file mode 100644
index c2a753cc5d..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c171.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c180.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c180.dat
deleted file mode 100644
index cb9391aed1..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c180.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c191.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c191.dat
deleted file mode 100644
index d3cf1d6364..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c191.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat
deleted file mode 100644
index a7a2d536e9..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1a1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat
deleted file mode 100644
index 19097e69e7..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1b1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat
deleted file mode 100644
index 359525a31a..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1c0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat
deleted file mode 100644
index 9f257df932..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1d1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat
deleted file mode 100644
index e43e52fb7f..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1e0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat
deleted file mode 100644
index 7e6ee3b1e0..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c1f1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c20.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c20.dat
deleted file mode 100644
index 1be6390f06..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c20.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c200.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c200.dat
deleted file mode 100644
index b15d56855c..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c200.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c211.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c211.dat
deleted file mode 100644
index 84b0022312..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c211.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c221.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c221.dat
deleted file mode 100644
index 63106a9523..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c221.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c230.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c230.dat
deleted file mode 100644
index 9975f27c1f..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c230.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c241.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c241.dat
deleted file mode 100644
index 835c645a16..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c241.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c251.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c251.dat
deleted file mode 100644
index d3d6adf4fb..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c251.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c260.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c260.dat
deleted file mode 100644
index 8d7333df7d..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c260.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c271.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c271.dat
deleted file mode 100644
index af722f7d73..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c271.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c281.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c281.dat
deleted file mode 100644
index 3972983c2e..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c281.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c290.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c290.dat
deleted file mode 100644
index 31577b8124..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c290.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat
deleted file mode 100644
index 0f700d13a7..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2a1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat
deleted file mode 100644
index 1d6382fb3d..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2b1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat
deleted file mode 100644
index 3bc60d886b..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2c1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat
deleted file mode 100644
index c542d3c91c..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2d0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat
deleted file mode 100644
index 16abd20b5f..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2e1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat
deleted file mode 100644
index eb26be5932..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c2f0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c300.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c300.dat
deleted file mode 100644
index 1214f1df4b..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c300.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c31.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c31.dat
deleted file mode 100644
index 18c16f1123..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c31.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c311.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c311.dat
deleted file mode 100644
index 926cbf25b5..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c311.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c320.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c320.dat
deleted file mode 100644
index 07e7bc023c..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c320.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c331.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c331.dat
deleted file mode 100644
index fd827f9dc2..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c331.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c340.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c340.dat
deleted file mode 100644
index ca70319886..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c340.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c351.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c351.dat
deleted file mode 100644
index 8fbe2a527c..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c351.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c360.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c360.dat
deleted file mode 100644
index dcf9c746e1..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c360.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c371.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c371.dat
deleted file mode 100644
index 6f21a840ea..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c371.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c380.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c380.dat
deleted file mode 100644
index b512e8065f..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c380.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c391.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c391.dat
deleted file mode 100644
index 27006e95a1..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c391.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat
deleted file mode 100644
index 565dca97ac..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3a0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat
deleted file mode 100644
index 36894c9818..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3b1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat
deleted file mode 100644
index d0c538aede..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3c0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat
deleted file mode 100644
index 65bcec5527..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3d1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat
deleted file mode 100644
index bdab359420..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3e0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat
deleted file mode 100644
index dc2d278b57..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c3f1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c400.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c400.dat
deleted file mode 100644
index 3072709cec..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c400.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c41.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c41.dat
deleted file mode 100644
index 61086690f2..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c41.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c411.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c411.dat
deleted file mode 100644
index ca551d8249..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c411.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c420.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c420.dat
deleted file mode 100644
index f04de0840e..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c420.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c431.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c431.dat
deleted file mode 100644
index 398b1672cc..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c431.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c440.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c440.dat
deleted file mode 100644
index af259d0872..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c440.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c451.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c451.dat
deleted file mode 100644
index 772a18c658..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c451.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c460.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c460.dat
deleted file mode 100644
index 505428362d..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c460.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c471.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c471.dat
deleted file mode 100644
index 484d0df42d..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c471.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c481.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c481.dat
deleted file mode 100644
index faac073076..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c481.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c490.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c490.dat
deleted file mode 100644
index 7585319d21..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c490.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat
deleted file mode 100644
index 4fe8b786e3..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c4a1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c51.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c51.dat
deleted file mode 100644
index 7fc7937b15..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c51.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c60.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c60.dat
deleted file mode 100644
index d1fb08c946..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c60.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c71.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c71.dat
deleted file mode 100644
index d4c2090a3b..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c71.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c81.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c81.dat
deleted file mode 100644
index 38b6ea6520..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c81.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c90.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c90.dat
deleted file mode 100644
index a607a5969c..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/c90.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ca1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ca1.dat
deleted file mode 100644
index 19b4c9e340..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ca1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cb1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cb1.dat
deleted file mode 100644
index 73dc986572..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cb1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cc0.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cc0.dat
deleted file mode 100644
index d1eef3bb56..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cc0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cd1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cd1.dat
deleted file mode 100644
index c7e6db3ef7..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cd1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ce1.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ce1.dat
deleted file mode 100644
index 8fd3bf17a8..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/ce1.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cf0.dat b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cf0.dat
deleted file mode 100644
index 332b3d9a8a..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/seg0/cf0.dat
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/service.properties b/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/service.properties
deleted file mode 100644
index af9511d9c7..0000000000
--- a/branches/sca-java-0.99/samples/company-das/src/test/resources/dastest/service.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#C:\apacheSVN\java\target\dastest
-# ********************************************************************
-# *** Please do NOT edit this file. ***
-# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
-# ********************************************************************
-#Fri Feb 17 08:55:29 MST 2006
-SysschemasIndex2Identifier=225
-SyscolumnsIdentifier=144
-SysconglomeratesIndex1Identifier=49
-SysconglomeratesIdentifier=32
-SyscolumnsIndex2Identifier=177
-SysschemasIndex1Identifier=209
-SysconglomeratesIndex3Identifier=81
-SystablesIndex2Identifier=129
-SyscolumnsIndex1Identifier=161
-derby.serviceProtocol=org.apache.derby.database.Database
-SysschemasIdentifier=192
-derby.storage.propertiesId=16
-SysconglomeratesIndex2Identifier=65
-derby.serviceLocale=en_US
-SystablesIdentifier=96
-SystablesIndex1Identifier=113
diff --git a/branches/sca-java-0.99/samples/databinding-echo/README b/branches/sca-java-0.99/samples/databinding-echo/README
deleted file mode 100644
index 67c1aa32d5..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/README
+++ /dev/null
@@ -1,143 +0,0 @@
-DataBinding Echo Sample
-=======================
-
-This sample demonstrates how databindings are used to convert data formats as
-the data flows between components.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens, open a command prompt, navigate
-to this sample directory, and do
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;..\binding-echo-extension\target\sample-binding-echo-extension.jar;target\sample-databinding-echo.jar dbecho.EchoDataBindingClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:../binding-echo-extension/target/sample-binding-echo-extension.jar:target/sample-databinding-echo.jar dbecho.EchoDataBindingClient
-
-
-Sample Overview
----------------
-If reference and service interfaces are the same in all but the formats of
-data being passed to and returned from the operations of the interfaces,
-then SCA will try to apply appropriate transformations to the data formats
-to allow messages to pass.
-
-This sample shows this happening. ComponentA implements Interface1 which
-defines;
-
- String call(String msg)
- String call1(String msg)
-
-ComponentA defines a reference to ComponentB with Interface1. ComponentB
-however implements Interface2 which defines;
-
- Node call(Node msg);
- XMLStreamReader call1(XMLStreamReader msg);
-
-You can see from the test output below that SCA converts the call() msg from a
-String to a DOM object (org.apache.xerces.dom.DeferredDocumentImpl). It
-converts the call1() msg from a String to a XML stream reader
-(com.ctc.wstx.sr.ValidatingStreamReader).
-
-databinding-echo/
- src/
- main/
- java/
- dbecho/
- ComponentAImpl.java - component implementation
- ComponentBImpl.java - component implementation
- Echo.java - service interface with data binding
- EchoDataBindingClient.java - sample client code
- Interface1.java - service interface with data binding
- Interface2.java - service interface with data bindings
- resources/
- META-INF/
- services/
- org.apache.tuscany.sca.core.ModuleActivator - specifies the module activation class to call
- EchoDataBinding.composite - composite definition
- wsdl/
- echo.wsdl - WSDL deinitions
- test/
- java/
- dbecho/
- EchoDataBindingTestCase.java - junit test case
- databinding-echo.png - pictorial representation of the sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-TODO - Needs more description of what else is going on in this test
- properties, wsdl?
-
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows.
-
-cd databinding-echo
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] [Property] prefix: ABC
- [java] [Property] prefix1: ABC
- [java] [Property] bar: BAR
- [java] ComponentA --> Received message: <message><foo>123</foo></message> [java.lang.String]
- [java] ComponentB --> Received message: [#document: null] [org.apache.xerces.dom.DeferredDocumentImpl]
- [java] ComponentB --> Returned message: [#document: null] [org.apache.xerces.dom.DeferredDocumentImpl]
- [java] ComponentA --> Returned message: <?xml version="1.0" encoding="UTF-8"?><message><foo>123</foo></message> [java.lang.String]
- [java] [Property] prefix: ABC
- [java] [Property] prefix1: ABC
- [java] [Property] bar: BAR
- [java] ComponentA --> Received message: <message><foo>123</foo></message> [java.lang.String]
- [java] ComponentB --> Received message: com.ctc.wstx.sr.ValidatingStreamReader@4c444c44 [com.ctc.wstx.sr.ValidatingStreamReader]
- [java] ComponentB --> Returned message: com.ctc.wstx.sr.ValidatingStreamReader@4c444c44 [com.ctc.wstx.sr.ValidatingStreamReader]
- [java] ComponentA --> Returned message: <?xml version='1.0' encoding='UTF-8'?><message><foo>123</foo></message> [java.lang.String]
- [java] call response = <?xml version="1.0" encoding="UTF-8"?><message><foo>123</foo></message>
- [java] call1 response = <?xml version='1.0' encoding='UTF-8'?><message><foo>123</foo></message>
-
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd databinding-echo
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running dbecho.EchoDataBindingTestCase
-[Property] prefix: ABC
-[Property] prefix1: ABC
-[Property] bar: BAR
-ComponentA --> Received message: <message><foo>123</foo></message> [java.lang.String]
-ComponentB --> Received message: [#document: null] [org.apache.xerces.dom.DeferredDocumentImpl]
-ComponentB --> Returned message: [#document: null] [org.apache.xerces.dom.DeferredDocumentImpl]
-ComponentA --> Returned message: <?xml version="1.0" encoding="UTF-8"?><message><foo>123</foo></message> [java.lang.String]
-[Property] prefix: ABC
-[Property] prefix1: ABC
-[Property] bar: BAR
-ComponentA --> Received message: <message><foo>123</foo></message> [java.lang.String]
-ComponentB --> Received message: com.ctc.wstx.sr.ValidatingStreamReader@74e274e2 [com.ctc.wstx.sr.ValidatingStreamReader]
-ComponentB --> Returned message: com.ctc.wstx.sr.ValidatingStreamReader@74e274e2 [com.ctc.wstx.sr.ValidatingStreamReader]
-ComponentA --> Returned message: <?xml version='1.0' encoding='UTF-8'?><message><foo>123</foo></message> [java.lang.String]
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.653 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/databinding-echo/build.xml b/branches/sca-java-0.99/samples/databinding-echo/build.xml
deleted file mode 100644
index 22fc41228b..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/build.xml
+++ /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.
--->
-<project name="databinding-echo" default="compile">
- <property name="test.class" value="dbecho.EchoDataBindingClient" />
- <property name="test.jar" value="sample-databinding-echo.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- <pathelement location="../binding-echo-extension/target/sample-binding-echo-extension.jar "/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.png b/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.png
deleted file mode 100644
index afbbfff285..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.svg b/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.svg
deleted file mode 100644
index 87964abf86..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/databinding-echo.svg
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\databinding-echo"
- sodipodi:docname="databinding-echo.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\databinding-echo\databinding-echo.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="651.92601"
- inkscape:cy="392.43347"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="129"
- inkscape:window-y="144" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="translate(-1.428571,-2.857143)">
- <rect
- rx="12.858844"
- ry="14.71703"
- y="192.00235"
- x="258.31155"
- height="347.85706"
- width="416.42877"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">EchoDataBinding</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1883"
- width="115.66247"
- height="85.862968"
- x="383.82632"
- y="385.59885"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1885"
- transform="translate(116.2356,179.6603)"><flowRegion
- id="flowRegion1887"><rect
- id="rect1889"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1891">ComponentB</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 362.67592,417.44582 L 408.70328,417.44582 L 417.07188,430.5778 L 407.30852,442.69964 L 362.67592,442.69964 L 373.13669,430.5778 L 362.67592,417.44582 z "
- id="path1895" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 479.92825,415.60754 L 513.26329,415.60754 L 519.3242,428.73952 L 512.25314,440.86136 L 479.92825,440.86136 L 487.5044,428.73952 L 479.92825,415.60754 z "
- id="path1897" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 530.71429,300.52305 C 542.23557,306.08282 554.6675,310.12484 560.71429,324.80877 C 566.71449,361.72815 311.41635,367.01996 323.57143,396.95162 C 328.25255,419.41336 352.58793,422.22083 371.42857,430.52305"
- id="path1985"
- sodipodi:nodetypes="cccc" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 636.0161,399.32486 L 697.75773,399.32486 L 708.98347,428.79969 L 695.88678,456.00726 L 636.0161,456.00726 L 650.0483,428.79969 L 636.0161,399.32486 z "
- id="path1987" />
- </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="385.63062"
- y="257.1676"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(120.1827,59.8005)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">ComponentA</flowPara></flowRoot> <rect
- style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:0.99999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3006"
- width="58.861061"
- height="43.565228"
- x="413.73505"
- y="225.79604"
- rx="29.430531"
- ry="0" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 368.48016,289.0146 L 412.69432,289.0146 L 420.73325,302.14658 L 411.3545,314.26842 L 368.48016,314.26842 L 378.52884,302.14658 L 368.48016,289.0146 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 477.44718,289.31918 L 522.26576,289.31918 L 530.41458,302.45116 L 520.90763,314.573 L 477.44718,314.573 L 487.63323,302.45116 L 477.44718,289.31918 z "
- id="path3019" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1929"
- transform="translate(137.8698,15.88564)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1931"><rect
- id="rect1933"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara1939">prefix</flowPara><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara1946">prefix1</flowPara><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara1948">bar</flowPara><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara1950" /></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot1952"
- transform="translate(206.8091,83.74868)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1954"><rect
- id="rect1956"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara1964">Interface1</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot1975"
- transform="translate(90.30101,207.3812)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1977"><rect
- id="rect1979"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara1981">Interface2</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot1989"
- transform="translate(366.1555,195.5999)"><flowRegion
- id="flowRegion1991"><rect
- id="rect1993"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1995"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans">Echo</flowPara><flowPara
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara1997">Reference</flowPara><flowPara
- style="font-size:8;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara1999">binding.echo</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 517.28571,425.66591 C 645.85714,424.23734 645.85714,424.23734 645.85714,424.23734"
- id="path2003" />
- <rect
- style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:0.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2005"
- width="73.166656"
- height="30.708084"
- x="563.42657"
- y="202.31184"
- rx="36.583328"
- ry="0" />
- <rect
- style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:0.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2007"
- width="73.166656"
- height="30.708084"
- x="563.40656"
- y="246.5976"
- rx="36.583328"
- ry="0" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2009"
- transform="translate(285.8806,-8.394223)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2011"><rect
- id="rect2013"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara2021">messagePrefix</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot2023"
- transform="translate(285.1663,39.46291)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2025"><rect
- id="rect2027"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara2035">complexProperty</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 447.85714,241.95163 C 563.57143,215.52305 563.57143,215.52305 563.57143,215.52305"
- id="path2055" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2061"
- transform="translate(33.15817,261.6669)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2063"><rect
- id="rect2065"
- width="217.85715"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara2067">@DataBinding(&quot;org.w3c.dom.Node&quot;)</flowPara><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara2069">&amp;</flowPara><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara2071">@DataBinding(&quot;javax.xml.stream.XMLStreamReader&quot;)</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot2073"
- transform="translate(258.3449,71.60582)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2075"><rect
- id="rect2077"
- width="217.85715"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara2079">@DataBinding(&quot;java.lang.String&quot;)</flowPara><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara2083" /></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0"
- d="M 523.57143,293.3802 C 541.42857,289.09448 540.71429,289.09448 540.71429,289.09448"
- id="path2087" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0"
- d="M 322.14286,471.95163 C 375,436.95163 375,436.95163 375,436.95163"
- id="path2976" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2978"
- transform="translate(275.4877,156.6059)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2980"><rect
- id="rect2982"
- width="286.42859"
- height="42.85714"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara2988">&lt;db:databinding name=&quot;org.apache.axiom.om.OMElement&quot; /&gt;</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0"
- d="M 677.85714,397.66591 C 684.28571,376.95163 684.28571,376.95163 684.28571,376.95163"
- id="path2997" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3886"
- transform="translate(96.76088,84.52404)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- inkscape:transform-center-y="72.857143"
- inkscape:transform-center-x="90.714286"><flowRegion
- id="flowRegion3888"><rect
- id="rect3890"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara3892">Interface1</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 445.71429,250.52305 C 563.57143,262.66591 563.57143,262.66591 563.57143,262.66591"
- id="path1956" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1958"
- transform="translate(205.618,209.9526)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1960"><rect
- id="rect1962"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara1965">Echo</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot1967"
- transform="translate(259.7734,259.463)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1969"><rect
- id="rect1971"
- width="286.42859"
- height="42.85714"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara1973">@DataBinding(&quot;org.w3c.dom.Node&quot;)</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0"
- d="M 540.71429,471.23734 C 510,433.3802 511.42857,434.80877 511.42857,434.80877"
- id="path1975" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2867"
- transform="translate(-47.64121,63.74863)"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion2869"><rect
- id="rect2871"
- width="217.85715"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara2873">@DataBinding(&quot;java.lang.String&quot;)</flowPara><flowPara
- style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
- id="flowPara2875" /></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0"
- d="M 337.14286,286.23734 C 372.85714,294.80877 372.85714,294.80877 372.85714,294.80877"
- id="path2877" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/databinding-echo/pom.xml b/branches/sca-java-0.99/samples/databinding-echo/pom.xml
deleted file mode 100644
index f90b1204a7..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>sample-databinding-echo</artifactId>
- <name>Apache Tuscany Echo Data Binding Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sca-api</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-databinding</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sample-binding-echo</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
deleted file mode 100644
index 5679614164..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package dbecho;
-
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ComponentAImpl implements Interface1 {
-
- private Interface1 componentBReference;
-
- @Constructor
- public ComponentAImpl(@Reference(name = "componentBReference", required = true)
- Interface1 componentBReference) {
- this.componentBReference = componentBReference;
- }
-
- public String call(String msg) {
- String request = msg + " [" + msg.getClass().getName() + "]";
- System.out.println("ComponentA --> Received message: " + request);
- Object ret = componentBReference.call(msg);
- String response = ret + " [" + ret.getClass().getName() + "]";
- System.out.println("ComponentA --> Returned message: " + response);
- return (String) ret;
- }
-
- public String call1(String msg) {
- String request = msg + " [" + msg.getClass().getName() + "]";
- System.out.println("ComponentA --> Received message: " + request);
- Object ret = componentBReference.call1(msg);
- String response = ret + " [" + ret.getClass().getName() + "]";
- System.out.println("ComponentA --> Returned message: " + response);
- return (String) ret;
- }
-
- @Property(name="prefix")
- public void setPrefix(String prefix) {
- System.out.println("[Property] prefix: " + prefix);
- }
-
- @Property(name="prefix1")
- public void setPrefix1(String prefix1) {
- System.out.println("[Property] prefix1: " + prefix1);
- }
-
- /**
- * @param bar the bar to set
- */
- @Property(name="bar")
- public void setBar(String bar) {
- System.out.println("[Property] bar: " + bar);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
deleted file mode 100644
index ff8968837d..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.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 dbecho;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Reference;
-import org.w3c.dom.Node;
-
-/**
- * @version $Rev$ $Date$
- */
-@AllowsPassByReference
-public class ComponentBImpl implements Interface2 {
-
- private Echo echoReference;
-
- @Constructor
- public ComponentBImpl(@Reference(name = "echoReference", required = true)
- Echo echoReference) {
- this.echoReference = echoReference;
- }
-
- public Node call(Node msg) {
- String request = msg + " [" + msg.getClass().getName() + "]";
- System.out.println("ComponentB --> Received message: " + request);
- Node ret = (Node) echoReference.echo(msg);
- String response = ret + " [" + ret.getClass().getName() + "]";
- System.out.println("ComponentB --> Returned message: " + response);
- return ret;
- }
-
- public XMLStreamReader call1(XMLStreamReader msg) {
- String request = msg + " [" + msg.getClass().getName() + "]";
- System.out.println("ComponentB --> Received message: " + request);
-// XMLStreamReader ret = (XMLStreamReader) echoReference.echo(msg);
- String response = request;
- System.out.println("ComponentB --> Returned message: " + response);
- return msg;
- }
-}
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Echo.java b/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Echo.java
deleted file mode 100644
index 25ecc90454..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Echo.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 dbecho;
-
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@DataBinding("org.w3c.dom.Node")
-@Remotable
-public interface Echo {
- Object echo(Object msg);
-}
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
deleted file mode 100644
index 9ec3819899..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.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 dbecho;
-
-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
- * @version $Rev$ $Date$
- */
-public class EchoDataBindingClient {
- public static void main(String[] args) throws Exception {
-
- SCADomain scaDomain = SCADomain.newInstance("EchoDataBinding.composite");
-
- Interface1 componentA = scaDomain.getService(Interface1.class, "ComponentA");
- String response = componentA.call("<message><foo>123</foo></message>");
- String response1= componentA.call1("<message><foo>123</foo></message>");
-
-
- System.out.println("call response = " + response );
- System.out.println("call1 response = " + response1 );
-
- scaDomain.close();
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface1.java
deleted file mode 100644
index 70b450e358..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface1.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 dbecho;
-
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@DataBinding("java.lang.String")
-@Remotable
-public interface Interface1 {
- String call(String msg);
- String call1(String msg);
-}
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface2.java
deleted file mode 100644
index b62f1f425d..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/java/dbecho/Interface2.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 dbecho;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
-import org.osoa.sca.annotations.Remotable;
-import org.w3c.dom.Node;
-
-/**
- * @version $Rev$ $Date$
- */
-@DataBinding("org.w3c.dom.Node")
-@Remotable
-public interface Interface2 {
- Node call(Node msg);
- @DataBinding("javax.xml.stream.XMLStreamReader")
- XMLStreamReader call1(XMLStreamReader msg);
-}
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
deleted file mode 100644
index 2f042b8e34..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:local="http://tuscany.apache.org/xmlns/sca/binding/1.0"
- xmlns:f="http://foo"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- xmlns:e="http://echo"
- name="EchoDataBinding">
-
- <component name="ComponentA">
- <implementation.java class="dbecho.ComponentAImpl" />
- <reference name="componentBReference" target="ComponentB" />
- <property name="prefix">ABC</property>
- <property name="prefix1" source="$messagePrefix"></property>
- <property name="bar" source="$complexProperty/*[local-name()='foo']/*[local-name()='bar']"></property>
- </component>
-
- <component name="ComponentB">
- <implementation.java class="dbecho.ComponentBImpl" />
- </component>
-
- <reference name="EchoReference" promote="ComponentB/echoReference">
- <!--
- <interface.java interface="dbecho.Echo"/>
- -->
- <interface.wsdl interface="http://example.com/echo.wsdl#wsdl.interface(EchoPortType)"
- wsdli:wsdlLocation="http://example.com/echo.wsdl wsdl/echo.wsdl">
- <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement" />
- </interface.wsdl>
- <e:binding.echo/>
- </reference>
-
- <property name="messagePrefix" type="xsd:string">ABC</property>
- <property name="complexProperty" type="f:FooType">
- <foo>
- <bar attr="barAttr">BAR</bar>
- </foo>
- </property>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
deleted file mode 100644
index ef2308aa73..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<definitions name="StockQuote" targetNamespace="http://example.com/echo.wsdl" xmlns:tns="http://example.com/echo.wsdl"
- xmlns:xsd1="http://example.com/echo.xsd" xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
- <schema targetNamespace="http://example.com/echo.xsd" xmlns:tns="http://example.com/echo.xsd"
- xmlns="http://www.w3.org/2001/XMLSchema">
- <complexType name="messageType">
- <sequence>
- <element name="foo" type="string"></element>
- </sequence>
- </complexType>
- <element name="echo">
- <complexType>
- <sequence>
- <element name="message" type="tns:messageType" />
- </sequence>
- </complexType>
- </element>
- <element name="echoResponse">
- <complexType>
- <sequence>
- <element name="message" type="tns:messageType" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </types>
-
- <message name="EchoInput">
- <part name="body" element="xsd1:echo" />
- </message>
-
- <message name="EchoOutput">
- <part name="body" element="xsd1:echoResponse" />
- </message>
-
- <portType name="EchoPortType">
- <operation name="echo">
- <input message="tns:EchoInput" />
- <output message="tns:EchoOutput" />
- </operation>
- </portType>
-
-</definitions> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/branches/sca-java-0.99/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
deleted file mode 100644
index 43434d8cee..0000000000
--- a/branches/sca-java-0.99/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.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 dbecho;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoDataBindingTestCase extends TestCase {
-
- private SCADomain scaDomain;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("EchoDataBinding.composite");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- protected Interface1 componentA;
-
- public void testTransform() {
- componentA = scaDomain.getService(Interface1.class, "ComponentA");
- componentA.call("<message><foo>123</foo></message>");
- componentA.call1("<message><foo>123</foo></message>");
- }
-}
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/README b/branches/sca-java-0.99/samples/feed-aggregator/README
deleted file mode 100644
index ed47d4cb22..0000000000
--- a/branches/sca-java-0.99/samples/feed-aggregator/README
+++ /dev/null
@@ -1,79 +0,0 @@
-Feed Aggregator Sample
-======================================
-This sample demonstrates using the Feed binding to aggregator ATOM and RSS
-and publish a new aggregated feed.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-feed-aggregator.jar feed.SampleServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-feed-aggregator.jar feed.SampleServer
-
-Now the server is started you can point your Web browser to the URL of the
-aggregated feeds.
-
-Sample Overview
----------------
-The sample provides a single component exposing a Web resource.
-
-web-resource/
- src/
- main/
- java/
- feed/
- FeedAggregatorImpl.java - implementation of the Feed
- aggregator component
- SampleServer.java - starts the SCA Runtime and
- publishes the aggregated feeds
- resources/
- FeedAggregator.composite - the SCA assembly for this sample
- feed-aggregator.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant using the
-following commands
-
-cd feed-aggregator
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Added Servlet mapping: http://localhost:8083/rssAggregator
- [java] Added Servlet mapping: http://localhost:8083/atomAggregator/*
- [java] Sample Feed server started (press enter to shutdown)
-
- [java] To read the aggregated feeds, point your Web browser to the following addresses:
- [java] http://localhost:8083/atomAggregator
- [java] http://localhost:8083/atomAggregator/atomsvc (for the Atom service document)
- [java] http://localhost:8083/rssAggregator
- [java] http://localhost:8083/atomAggregator?feedType=rss_2.0
- [java] http://localhost:8083/rssAggregator?feedType=atom_1.0
-
-As this point the aggregated Feeds are exposed by a web server started
-automatically by the SCA runtime. To stop the server just press enter.
-
-Building The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built using
-Maven as follows.
-
-cd feed-aggregator
-mvn
-
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/build.xml b/branches/sca-java-0.99/samples/feed-aggregator/build.xml
deleted file mode 100644
index 2118e13db7..0000000000
--- a/branches/sca-java-0.99/samples/feed-aggregator/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="feed-aggregator" default="compile">
- <property name="test.class" value="feed.SampleServer" />
- <property name="test.jar" value="sample-feed-aggregator.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/pom.xml b/branches/sca-java-0.99/samples/feed-aggregator/pom.xml
deleted file mode 100644
index eadcd22691..0000000000
--- a/branches/sca-java-0.99/samples/feed-aggregator/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>sample-feed-aggregator</artifactId>
- <name>Apache Tuscany Atom+RSS Feed Aggregator Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-feed</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-http-tomcat</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
deleted file mode 100644
index 6d15b5426b..0000000000
--- a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package feed;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.feed.collection.NotFoundException;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-import com.sun.syndication.feed.atom.Content;
-import com.sun.syndication.feed.atom.Entry;
-import com.sun.syndication.feed.atom.Link;
-import com.sun.syndication.feed.atom.Person;
-
-/**
- * Implementation of an SCA component that aggregates several
- * Atom and RSS feeds.
- *
- * @version $Rev$ $Date$
- */
-public class AggregatorImpl implements org.apache.tuscany.sca.binding.feed.collection.Collection {
-
- @Reference
- public org.apache.tuscany.sca.binding.feed.collection.Collection feed1;
- @Reference
- public org.apache.tuscany.sca.binding.feed.collection.Collection feed2;
- @Reference(required = false)
- public Sort sort;
-
- @Property
- public String feedTitle = "Aggregated Feed";
- @Property
- public String feedDescription = "Anonymous Aggregated Feed";
- @Property
- public String feedAuthor = "anonymous";
-
- @SuppressWarnings("unchecked")
- public com.sun.syndication.feed.atom.Feed getFeed() {
-
- // Create a new Feed
- com.sun.syndication.feed.atom.Feed feed = new com.sun.syndication.feed.atom.Feed();
- feed.setTitle(feedTitle);
- Content subtitle = new Content();
- subtitle.setValue(feedDescription);
- feed.setSubtitle(subtitle);
- Person author = new Person();
- author.setName(feedAuthor);
- feed.setAuthors(Collections.singletonList(author));
- Link link = new Link();
- link.setHref("http://incubator.apache.org/tuscany");
- feed.getAlternateLinks().add(link);
-
- // Aggregate entries from feed1 and feed2
- List<Entry> entries = new ArrayList<Entry>();
- entries.addAll(feed1.getFeed().getEntries());
- entries.addAll(feed2.getFeed().getEntries());
-
- // Sort entries by published date
- if (sort != null)
- feed.setEntries(sort.sort(entries));
- else
- feed.setEntries(entries);
- return feed;
- }
-
- public void delete(String id) throws NotFoundException {
- }
-
- public Entry get(String id) throws NotFoundException {
- return null;
- }
-
- public Entry post(Entry entry) {
- return null;
- }
-
- public Entry put(String id, Entry entry) throws NotFoundException {
- return null;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SampleServer.java b/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SampleServer.java
deleted file mode 100644
index 05961a315c..0000000000
--- a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SampleServer.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 feed;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class SampleServer {
- public static void main(String[] args) throws Exception {
-
- SCADomain scaDomain = SCADomain.newInstance("FeedAggregator.composite");
-
- try {
- System.out.println("Sample Feed server started (press enter to shutdown)");
- System.out.println();
- System.out.println("To read the aggregated feeds, point your Web browser to the following addresses:");
- System.out.println("http://localhost:8083/atomAggregator");
- System.out.println("http://localhost:8083/atomAggregator/atomsvc (for the Atom service document)");
- System.out.println("http://localhost:8083/rssAggregator");
- System.out.println("http://localhost:8083/atomAggregator?feedType=rss_2.0");
- System.out.println("http://localhost:8083/rssAggregator?feedType=atom_1.0");
- System.out.println();
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- // RssFeed feedService = scaDomain.getService(RssFeed.class,
- // "RssAggregatorComponent");
- // SyndFeed syndFeed = feedService.get();
- // SyndFeedOutput output = new SyndFeedOutput();
- // output.output(syndFeed,new PrintWriter(System.out));
-
- scaDomain.close();
- System.out.println("Sample Feed server stopped");
- }
-}
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/Sort.java b/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/Sort.java
deleted file mode 100644
index db26ad9350..0000000000
--- a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/Sort.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 feed;
-
-import java.util.List;
-
-import com.sun.syndication.feed.atom.Entry;
-
-/**
- * The Sort service business interface.
- *
- * @version $Rev$ $Date$
- */
-public interface Sort {
-
- /**
- * Sort feed entries by published date.
- * @param entries
- * @return
- */
- List<Entry> sort(List<Entry> entries);
-}
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SortImpl.java
deleted file mode 100644
index 62d90bfa3b..0000000000
--- a/branches/sca-java-0.99/samples/feed-aggregator/src/main/java/feed/SortImpl.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 feed;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-
-import org.osoa.sca.annotations.Property;
-
-import com.sun.syndication.feed.atom.Entry;
-
-/**
- * Implementation of a Feed Sort service component.
- *
- * @version $Rev$ $Date$
- */
-public class SortImpl implements Sort {
-
- @Property
- public boolean newFirst = true;
-
- @SuppressWarnings("unchecked")
- public List<Entry> sort(List<Entry> entries) {
- Entry[] entriesArray = new Entry[entries.size()];
- entriesArray = (Entry[])entries.toArray(entriesArray);
- Arrays.sort(entriesArray, new Comparator() {
- public int compare(final Object xObj, final Object yObj) {
- Date xDate = ((Entry)xObj).getPublished();
- Date yDate = ((Entry)yObj).getPublished();
- if (xDate == null)
- return -1;
- if (newFirst)
- return yDate.compareTo(xDate);
- else
- return xDate.compareTo(yDate);
- }
- });
- return Arrays.asList(entriesArray);
- }
-}
diff --git a/branches/sca-java-0.99/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/branches/sca-java-0.99/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
deleted file mode 100644
index df02ba8536..0000000000
--- a/branches/sca-java-0.99/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://aggregator"
- name="FeedAggregator">
-
- <service name="rssSample" promote="RssAggregator">
- <tuscany:binding.rss uri="http://localhost:8083/rssAggregator"/>
- </service>
- <service name="atomSample" promote="AtomAggregator">
- <tuscany:binding.atom uri="http://localhost:8083/atomAggregator"/>
- </service>
-
- <component name="RssAggregator">
- <implementation.java class="feed.AggregatorImpl"/>
- <reference name="feed1">
- <tuscany:binding.rss uri="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml"/>
- </reference>
- <reference name="feed2">
- <tuscany:binding.rss uri="http://www.engadget.com/rss.xml"/>
- </reference>
- <reference name="sort" target="Sort"/>
- <property name="feedTitle">Rss Sample</property>
- </component>
- <component name="Sort">
- <implementation.java class="feed.SortImpl"/>
- <property name="newFirst">true</property>
- </component>
-
- <component name="AtomAggregator">
- <implementation.java class="feed.AggregatorImpl"/>
- <reference name="sort" target="Sort"/>
- <reference name="feed1">
- <tuscany:binding.atom uri="http://www.oreillynet.com/pub/feed/1"/>
- </reference>
- <reference name="feed2">
- <tuscany:binding.atom uri="http://www.apachenews.org/atom.xml"/>
- </reference>
- <property name="feedTitle">Atom Sample</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/README b/branches/sca-java-0.99/samples/helloworld-dojo/README
deleted file mode 100644
index cc25b50192..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/README
+++ /dev/null
@@ -1,101 +0,0 @@
-Hello World Dojo RPC Sample
-===========================
-This sample demostrates the SCA JSONRPC binding using a simple web app that
-uses the RPC support of the Dojo Toolkit to an SCA service.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want
-to give this sample a go deploy the WAR file (target/sample-helloworld-dojo.war)
-to you web application server.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-dojo
-
-The port and hostname will of course vary depending on your local installation.
-
-See also the similar helloworld-jsonrpc sample which also uses the SCA JSONRPC binding
-but uses SCA scaDomain.js script on the client instead of the Dojo Toolkit.
-
-Sample Overview
----------------
-The sample provides a single service with an operation that reflects
-a greeting back to the caller. The service is exposed using the JSONRPC
-binding. The web app provided shows how the Dojo Toolkit JSON-RPC support can be
-used to invoke the SCA service.
-
-The web app provided shows how the service can be called by using the DOJO toolkit.
-
-helloworld-dojo/
- build-dojo.xml - This file is an Ant script used by the
- sample build process to download the Dojo Toolkit
- and get it included in the WAR file
- for use by the sample.
- src/
- main/
- java/
- helloworldjsonrpc/
- HelloWorldService.java - service interface
- HelloWorldServiceImpl.java - service implementation
- resources/
- jsonrpc.composite - the SCA assembly for this sample
- webapp
- dojo/ - the Dojo toolkit (this directory is created only
- when you build the samples from the source distribution)
- META-INF/
- sca-contribution.xml - specifies the composite to be deployed
- WEB-INF/
- web.xml - defines the listener that starts up the
- Tuscany SCA runtime
- HelloWorldJSONRPC.html - the web application that calls the
- SCA service via JSONRPC
- style.css - style sheet
-
- helloworld-jsonrpc.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file that unpacks the
- dojo installation
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as
-follows
-
-cd helloworld-dojo
-ant package
-
-This should result in a war file (sample-helloworld-dojo.war) in the target
-directory. Copy this war file to your web app deployment directory in your
-web app container.
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-dojo
-
-The port and hostname will of course vary depending on your local installation.
-
-You should see a web page that allows you to send messages, via JSONRPC, to the
-application running in the Tuscany SCA Runtime
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd helloworld-dojo
-mvn
-
-Again this should result in a war file (sample-helloworld-dojo.war) in the target
-directory. Follow the steps described in the previous section for running the web
-app and for the expected results.
-
-
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/build-dojo.xml b/branches/sca-java-0.99/samples/helloworld-dojo/build-dojo.xml
deleted file mode 100644
index 335a10817a..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/build-dojo.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="DojoZipInstaller">
-
-
- <property name="dojo.version" value="0.4.0"/>
- <property name="dojo.distro" value="ajax"/>
- <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
-
-
- <target name="check-dojo-installed">
- <condition property="already.installed" >
- <available file="${localRepository}/dojo/dojo-${dojo.distro}/${dojo.version}/dojo-${dojo.distro}-${dojo.version}.zip"/>
- </condition>
- <condition property="maven.suffix" value="">
- <os family="unix"/>
- </condition>
- <condition property="maven.suffix" value=".bat">
- <os family="windows"/>
- </condition>
- </target>
-
-
- <target name="check-dojo-unpacked">
- <condition property="already.unpacked" >
- <available file="${unpack.location}"/>
- </condition>
- </target>
-
- <target name="install-dojo" depends="check-dojo-installed" unless="already.installed">
- <mkdir dir="${basedir}/target/dojo-download/"/>
- <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-${dojo.version}-${dojo.distro}.zip"
- dest="${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"
- verbose="true"
- usetimestamp="true"/>
- <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
- <arg line="install:install-file -DgroupId=dojo -DartifactId=dojo-${dojo.distro} -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"/>
- </exec>
- </target>
-
- <target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
- <mkdir dir="${basedir}/target/dojo-download/"/>
- <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-${dojo.version}-${dojo.distro}.zip"
- dest="${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"
- verbose="true"
- usetimestamp="true"/>
- <copy file="${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"
- tofile="${localRepository}/dojo/dojo-${dojo.distro}/${dojo.version}/dojo-${dojo.distro}-${dojo.version}.zip"/>
- </target>
-
-
- <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
- <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
- <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
- <unzip src="${localRepository}/dojo/dojo-${dojo.distro}/${dojo.version}/dojo-${dojo.distro}-${dojo.version}.zip"
- dest="${basedir}/target/dojo-unpack-temp/"
- overwrite="false">
- <patternset>
- <include name="dojo-${dojo.version}-${dojo.distro}/**"/>
- <exclude name="dojo-${dojo.version}-${dojo.distro}/demos/**"/>
- <exclude name="dojo-${dojo.version}-${dojo.distro}/tests/**"/>
- </patternset>
- </unzip>
- <move file="${basedir}/target/dojo-unpack-temp/dojo-${dojo.version}-${dojo.distro}"
- tofile="${unpack.location}"
- verbose="true"/>
- <delete dir="${basedir}/target/dojo-unpack-temp/"/>
- </target>
-
-
- <target name="clean-dojo-files">
- <delete dir="${unpack.location}"/>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/build.xml b/branches/sca-java-0.99/samples/helloworld-dojo/build.xml
deleted file mode 100644
index 261d55c540..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/build.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="helloworld-dojo" default="package">
- <property name="settings.localRepository" value="./target/repo" />
- <property name="artifactId" value="sample-helloworld-dojo" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- </target>
-
- <target name="package" depends="compile">
- <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
- <property name="localRepository" value="${settings.localRepository}"/>
- </ant>
-
- <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
-
- <war destfile="target/sample-helloworld-dojo.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <zipfileset dir="../../modules" prefix="WEB-INF/lib">
- <include name="sca-api-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-extension-helper-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-xml-0.91-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-0.91-incubating-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="../../lib">
- <include name="json-rpc-1.0.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="wsdl4j-1.6.2.jar"/>
- <include name="wstx-asl-3.2.0.jar"/>
- <include name="XmlSchema-1.3.1.jar"/>
- <include name="**/../../modules/*.jar"/>
- </lib>
- <classes dir="target/classes"/>
- </war>
-
- <ant antfile="./build-dojo.xml" target="clean-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
- </target>
-
-
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.png b/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.png
deleted file mode 100644
index 57f90aed01..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.svg b/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.svg
deleted file mode 100644
index 5c5cb91157..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/helloworld-jsonrpc.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc"
- sodipodi:docname="helloworld-jsonrpc.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc\helloworld-jsonrpc.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="516.28571"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="158"
- inkscape:window-y="164" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="translate(144.2857,52.85714)">
- <rect
- rx="8.0946665"
- ry="12.692303"
- y="192.00233"
- x="258.31134"
- height="299.99988"
- width="262.14267"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999893;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">helloworldjsonrpc</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="449.91632"
- y="349.31049"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(190.3256,143.3719)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">HelloWorld</flowPara><flowPara
- id="flowPara1883">JSONService</flowPara><flowPara
- id="flowPara1885">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 373.48019,364.72909 L 455.16689,364.72909 L 470.019,392.34681 L 452.69154,417.84009 L 373.48019,417.84009 L 392.04536,392.34681 L 373.48019,364.72909 z "
- id="path3017" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1887"
- transform="translate(113.6483,167.4037)"><flowRegion
- id="flowRegion1889"><rect
- id="rect1891"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1893">HelloWorld</flowPara><flowPara
- id="flowPara1897">Service</flowPara></flowRoot> <rect
- style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1888"
- width="85"
- height="97.85714"
- x="214.28571"
- y="340.52307"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1892"
- transform="translate(-56.88742,135.3526)"><flowRegion
- id="flowRegion1894"><rect
- id="rect1896"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1900">WebApp</flowPara></flowRoot> <rect
- style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1912"
- width="45.714287"
- height="40.714287"
- x="277.85715"
- y="370.52304"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1914"
- transform="translate(1.400116,166.6895)"><flowRegion
- id="flowRegion1916"><rect
- id="rect1918"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1920">DOJO</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 324.28571,391.23734 C 391.42857,391.95163 391.42857,391.95163 391.42857,391.95163"
- id="path1922" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/pom.xml b/branches/sca-java-0.99/samples/helloworld-dojo/pom.xml
deleted file mode 100644
index 16f33de216..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-dojo</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany Dojo Sample WebApp</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <!-- version>1.1</version -->
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
-
- <executions>
- <execution>
- <id>install-dojo</id>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="install-dojo">
- <property name="localRepository" value="${settings.localRepository}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>copy-dojo-files</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>clean-dojo-files</id>
- <phase>clean</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-dojo.xml" target="clean-dojo-files">
- <property name="localRepository" value="${settings.localRepository}"/>
- <property name="artifactId" value="${artifactId}"/>
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java b/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java
deleted file mode 100644
index 3d8ea24f04..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package helloworldjsonrpc;
-
-/**
- * This is the business interface of the HelloWorld service component.
- */
-public interface HelloWorldService {
-
- String getGreetings(String name);
-
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
deleted file mode 100644
index 35fd00fabd..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.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 helloworldjsonrpc;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service component.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- /*
- * @see org.apache.tuscany.samples.helloworld.HelloWorldServiceComponent#getGreetings()
- */
- public String getGreetings(String name) {
- return "jsonrpcHello " + name;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/resources/jsonrpc.composite b/branches/sca-java-0.99/samples/helloworld-dojo/src/main/resources/jsonrpc.composite
deleted file mode 100644
index e895ab455d..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/resources/jsonrpc.composite
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="helloworldjsonrpc">
-
- <service name="HelloWorldService" promote="HelloWorldJSONServiceComponent/HelloWorldService">
- <interface.java interface="helloworldjsonrpc.HelloWorldService"/>
- <tuscany:binding.jsonrpc/>
- </service>
-
- <component name="HelloWorldJSONServiceComponent">
- <implementation.java class="helloworldjsonrpc.HelloWorldServiceImpl"/>
- </component>
-
-</composite>
-
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html b/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
deleted file mode 100644
index e8aa2b6615..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<html>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
- <head>
- <title>Tuscany JSON-RPC HelloWorld Example</TITLE>
-
- <script type="text/javascript">
- var djConfig = {isDebug: true,debugContainerId: "dojoDebug" };
- //djConfig.debugAtAllCosts = true;
- </script>
-
- <script type="text/javascript" src="dojo/dojo.js"></script>
-
- <script type="text/javascript">
- dojo.require("dojo.widget.*");
- dojo.require("dojo.widget.Button");
- dojo.require("dojo.rpc.JsonService");
- </script>
-
- <link rel="stylesheet" type="text/css" href="style.css" />
-
- </head>
-
- <body>
-
- <h2>Tuscany Dojo JSON-RPC HelloWorld Sample</h2>
-
- <table>
- <tr>
- <th colspan="2">Dojo Example</th>
- </tr>
- <tr>
- <td colspan="2">
- <p>This example uses the <a href="http://dojotoolkit.org/">Dojo Toolkit</a>
- to create a JavaScript object <code>helloWorldService</code> for the SCA service
- 'HelloWorldService' using <a href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9">Dojo's RPC classes</a>
- and providing them with <a href="SCA/SCADomain/HelloWorldService?smd">SCA/SCADomain/HelloWorldService?smd</a>
- for <a href="http://dojo.jot.com/SMD">Simple Method Description (SMD)</a> input.</p>
- <p>It then creates a Dojo button that will envoke the <code>getGreetings</code> method of the <code>HelloWorldService</code> object.</p>
- </tr>
- <tr>
- <td>Request</td>
- <td>Response</td>
- </tr>
- <tr>
- <td>
- <br><div id="myecho" dojoType="Button" onClick='helloWorldService.getGreetings("Dojo").addCallback(contentCallBack);'>helloWorldService.getGreetings("Dojo").addCallback(contentCallBack);</div><br>
- </td>
- <td>
- <div id="ReturnedContent">None Yet.</div>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <div id="dojoDebug">Dojo Debug:</div>
- </td>
- </tr>
- </table>
-
-
-
-
- <script type="text/javascript">
-
- function contentCallBack(result) {
- var handlerNode = document.getElementById("ReturnedContent");
- handlerNode.innerHTML = "<p>" + result + "</p>" ;
- }
-
- var helloWorldService = new dojo.rpc.JsonService("SCA/HelloWorldService?smd");
-
- </script>
-
- </body>
-</html>
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 2c178c1ddc..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:helloworldjsonrpc"/>
-</contribution>
-
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 52117b1dce..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>Tuscany sample HelloWorld JSON-RPC</display-name>
-
- <listener>
- <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>TuscanyServlet</servlet-name>
- <servlet-class>org.apache.tuscany.sca.host.webapp.TuscanyServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TuscanyServlet</servlet-name>
- <url-pattern>/SCA/*</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>HelloWorldJSONRPC.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/style.css b/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-dojo/src/main/webapp/style.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-* { font-family: arial; }
-
-table, th, td { border: 2px solid blue; border-collapse: collapse; }
-th { color: white; background-color: blue; }
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/README b/branches/sca-java-0.99/samples/helloworld-jsonrpc/README
deleted file mode 100644
index 93a2c703ac..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/README
+++ /dev/null
@@ -1,90 +0,0 @@
-Hello World JSONRPC Sample
-==========================
-This sample demostrates the JSONRPC binding using a simple web app that
-talks JSONRPC to an SCA service.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-As this sample provides a web app there is a manual step where the WAR file
-that contains the sample is copied to your web app container. If you just want
-to give this sample a go deploy the WAR file (target/sample-helloworld-jsonrpc.war)
-to you web application server.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-jsonrpc
-
-The port and hostname will of course vary depending on your local installation.
-
-Sample Overview
----------------
-The sample provides a single service with an operation that reflects
-a greeting back to the caller. The service is exposed using the JSONRPC
-binding. The web app provided shows how the SCA-provided JSON client can be
-used to invoke the SCA service.
-
-helloworld-jsonrpc/
- src/
- main/
- java/
- helloworldjsonrpc/
- HelloWorldService.java - service interface
- HelloWorldServiceImpl.java - service implementation
- resources/
- jsonrpc.composite - the SCA assembly for this sample
- webapp
- META-INF/
- sca-contribution.xml - specifies the composite to be deployed
- WEB-INF/
- web.xml - defines the listener that starts up the
- Tuscany SCA runtime
- HelloWorldJSONRPC.html - the web application that calls the
- SCA service via JSONRPC
- style.css - style sheet
-
- helloworld-jsonrpc.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file that unpacks the
- dojo installation
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as
-follows
-
-cd helloworld-jsonrpc
-ant package
-
-This should result in a war file (sample-helloworld-jsonrpc.war) in the target
-directory. Copy this war file to your web app deployment directory in your
-web app container.
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-jsonrpc
-
-The port and hostname will of course vary depending on your local installation.
-
-You should see a web page that allows you to send messages, via JSONRPC, to the
-application running in the Tuscany SCA Runtime
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd helloworld-jsonrpc
-mvn
-
-Again this should result in a war file (sample-helloworld-jsonrpc.war) in the target
-directory. Follow the steps described in the previous section for running the web
-app and for the expected results.
-
-
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/build.xml b/branches/sca-java-0.99/samples/helloworld-jsonrpc/build.xml
deleted file mode 100644
index dd3d5e6512..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="helloworld-jsonrpc" default="package">
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- </target>
-
- <target name="package" depends="compile">
- <war destfile="target/sample-helloworld-jsonrpc.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <zipfileset dir="../../modules" prefix="WEB-INF/lib">
- <include name="sca-api-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-distributed-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-extension-helper-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-0.99-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-0.99-incubating-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="../../lib">
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="json-rpc-1.0.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- </lib>
- <classes dir="target/classes"/>
- </war>
-
- </target>
-
-
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.png b/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
deleted file mode 100644
index 57f90aed01..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg b/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
deleted file mode 100644
index fe966d8c17..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/helloworld-jsonrpc.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc"
- sodipodi:docname="helloworld-jsonrpc.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc\helloworld-jsonrpc.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="516.28571"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="158"
- inkscape:window-y="164" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="translate(144.2857,52.85714)">
- <rect
- rx="8.0946665"
- ry="12.692303"
- y="192.00233"
- x="258.31134"
- height="299.99988"
- width="262.14267"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999893;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">helloworldjsonrpc</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="449.91632"
- y="349.31049"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(190.3256,143.3719)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">HelloWorld</flowPara><flowPara
- id="flowPara1883">JSONService</flowPara><flowPara
- id="flowPara1885">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 373.48019,364.72909 L 455.16689,364.72909 L 470.019,392.34681 L 452.69154,417.84009 L 373.48019,417.84009 L 392.04536,392.34681 L 373.48019,364.72909 z "
- id="path3017" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1887"
- transform="translate(113.6483,167.4037)"><flowRegion
- id="flowRegion1889"><rect
- id="rect1891"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1893">HelloWorld</flowPara><flowPara
- id="flowPara1897">Service</flowPara></flowRoot> <rect
- style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1888"
- width="85"
- height="97.85714"
- x="214.28571"
- y="340.52307"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1892"
- transform="translate(-56.88742,135.3526)"><flowRegion
- id="flowRegion1894"><rect
- id="rect1896"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1900">WebApp</flowPara></flowRoot> <rect
- style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1912"
- width="45.714287"
- height="40.714287"
- x="277.85715"
- y="370.52304"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1914"
- transform="translate(1.400116,166.6895)"><flowRegion
- id="flowRegion1916"><rect
- id="rect1918"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1920">DOJO</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 324.28571,391.23734 C 391.42857,391.95163 391.42857,391.95163 391.42857,391.95163"
- id="path1922" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/pom.xml b/branches/sca-java-0.99/samples/helloworld-jsonrpc/pom.xml
deleted file mode 100644
index e7c0f37e99..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-jsonrpc</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany JSON-RPC Sample WebApp</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java b/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
deleted file mode 100644
index 3d8ea24f04..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package helloworldjsonrpc;
-
-/**
- * This is the business interface of the HelloWorld service component.
- */
-public interface HelloWorldService {
-
- String getGreetings(String name);
-
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
deleted file mode 100644
index 35fd00fabd..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.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 helloworldjsonrpc;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service component.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- /*
- * @see org.apache.tuscany.samples.helloworld.HelloWorldServiceComponent#getGreetings()
- */
- public String getGreetings(String name) {
- return "jsonrpcHello " + name;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite b/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
deleted file mode 100644
index e895ab455d..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/resources/jsonrpc.composite
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="helloworldjsonrpc">
-
- <service name="HelloWorldService" promote="HelloWorldJSONServiceComponent/HelloWorldService">
- <interface.java interface="helloworldjsonrpc.HelloWorldService"/>
- <tuscany:binding.jsonrpc/>
- </service>
-
- <component name="HelloWorldJSONServiceComponent">
- <implementation.java class="helloworldjsonrpc.HelloWorldServiceImpl"/>
- </component>
-
-</composite>
-
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html b/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
deleted file mode 100644
index 98853189db..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/HelloWorldJSONRPC.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
- <head>
- <title>Tuscany JSON-RPC HelloWorld Example</TITLE>
-
- <script type="text/javascript" src="SCA/SCADomain/scaDomain.js"></script>
-
- <script language="JavaScript">
-
- function getGreeting() {
- var name = document.getElementById("name").value;
- HelloWorldService.getGreetings(name, handleResponse);
- }
-
- function handleResponse(result) {
- document.getElementById('greeting').innerHTML=result;
- }
-
- </script>
-
- <link rel="stylesheet" type="text/css" href="style.css" />
- </head>
-
- <body>
-
- <h2>Tuscany JSON-RPC HelloWorld Sample</h2>
-
- <table>
- <tr>
- <th colspan="2">Non-Dojo Example</th>
- </tr>
- <tr>
- <td colspan="2">
- This example uses the JavaScript served from
- <a href="SCA/SCADomain/scaDomain.js">SCA/SCADomain/scaDomain.js</a>
- to make JSON-RPC requests to the SCA service 'HelloWorldService'
- </tr>
- <tr>
- <td>Request</td>
- <td>Response</td>
- </tr>
- <tr>
- <td>
- <p>
- Name please: &nbsp;&nbsp;&nbsp;
- <input type="text" id="name" size="30" value="World" />
- <input type="button" value="Submit" onclick="getGreeting()" />
- </p>
-
- </td>
- <td>
- <div id='greeting'>None Yet.</div>
- </td>
- </tr>
- </table>
-
- </body>
-</html>
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index c8246e15a7..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
--->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:helloworldjsonrpc"/>
-</contribution>
-
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 52117b1dce..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>Tuscany sample HelloWorld JSON-RPC</display-name>
-
- <listener>
- <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>TuscanyServlet</servlet-name>
- <servlet-class>org.apache.tuscany.sca.host.webapp.TuscanyServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TuscanyServlet</servlet-name>
- <url-pattern>/SCA/*</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>HelloWorldJSONRPC.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/style.css b/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/style.css
deleted file mode 100644
index 1071583264..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-jsonrpc/src/main/webapp/style.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-* { font-family: arial; }
-
-table, th, td { border: 2px solid blue; border-collapse: collapse; }
-th { color: white; background-color: blue; }
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/README b/branches/sca-java-0.99/samples/helloworld-ws-reference/README
deleted file mode 100644
index 8ee8dd7ff5..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/README
+++ /dev/null
@@ -1,153 +0,0 @@
-Hello World Web Service References Sample
-=========================================
-This sample demonstrates an SCA reference that uses a web service binding.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens you need to run the server first
-so open a command prompt, navigate to the helloworld-ws-service sample directory
-and do
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-
-Once the server is running open a command prompt, navigate to this sample
-directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-reference.jar helloworld.HelloWorldClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-reference.jar helloworld.HelloWorldClient
-
-
-Sample Overview
----------------
-The sample provides a single component that is wired to a reference with a
-web service binding. The binding refers to WSDL that identifies the service
-exposed by the helloworld-ws-service sample.
-
-helloworld-ws-reference/
- src/
- main/
- java/
- helloworld/
- HelloWorldService.java - interface description for
- HelloWorldServiceComponent
- HelloWorldServiceComponent.java - component implementation
- HelloWorldClient.java - starts the SCA Runtime and
- deploys the helloworldwsclient
- .composite. It then calls the
- HelloWorldServiceComponent
- resources/
- wsdl
- helloworld.wsdl - the service description that the
- SCA reference uses to bind to
- helloworldwsclient.composite - the SCA assembly for this sample
- logging.properties - log4j configuration file
- test/
- java/
- helloworld/
- HelloWorldClientTestCase.java - JUnit test case
- HelloWorldServerTest.java - starts the Web service
- helloworld-ws-reference.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant. Before
-you do this start up the service that the reference will talk to. To do this
-run up the helloworld-ws-service test. Take a look at the README in that sample
-and you will see you need the following commands
-
-cd helloworld-ws-service
-ant run
-
-Once done you can now compile and run this sample using the following commands;
-
-cd helloworld-ws-reference
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] Injected helloWorldService
- [java] Called getGreetings
- [java] Hello World
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows. When using Maven you don't need to run the helloworld-
-ws-service sample first as Maven does this for you.
-
-cd helloworld-ws-reference
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldClientTestCase
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX
-Utils).
-log4j:WARN Please initialize the log4j system properly.
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX
-Utils).
-log4j:WARN Please initialize the log4j system properly.
-10-May-2007 13:40:34 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-10-May-2007 13:40:35 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_1_4.xsd
-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/xml.xsd
-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/web-app_2_4.xsd
-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-10-May-2007 13:40:35 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_client
-_1_1.xsd
-10-May-2007 13:40:35 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-10-May-2007 13:40:35 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-Injected helloWorldService
-Called getGreetings
-10-May-2007 13:40:36 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.349 sec
-
-Results :
-
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/build.xml b/branches/sca-java-0.99/samples/helloworld-ws-reference/build.xml
deleted file mode 100644
index 71ee66b31e..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="helloworld-ws-reference" default="compile">
- <property name="test.class" value="helloworld.HelloWorldClient" />
- <property name="test.jar" value="sample-helloworld-ws-reference.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.png b/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.svg
deleted file mode 100644
index 354ffbae8f..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/helloworld-ws-reference.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference"
- sodipodi:docname="helloworld-ws-reference.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="519.38407"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="85"
- inkscape:window-y="295" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(0.991389,0,0,1,2.215655,0)">
- <rect
- rx="13.79423"
- ry="12.692303"
- y="192.00233"
- x="258.3114"
- height="299.99988"
- width="446.72086"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">helloworldwsclient</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="432.05917"
- y="307.1676"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(172.4684,115.2291)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">HelloWorld</flowPara><flowPara
- id="flowPara1883">Service</flowPara><flowPara
- id="flowPara1885">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 528.16111,337.17632 L 561.49615,337.17632 L 567.55706,350.3083 L 560.486,362.43014 L 528.16111,362.43014 L 535.73726,350.3083 L 528.16111,337.17632 z "
- id="path3019" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 651.01647,320.75333 L 718.80207,320.75333 L 731.12672,349.11387 L 716.74797,375.29287 L 651.01647,375.29287 L 666.4223,349.11387 L 651.01647,320.75333 z "
- id="path1887" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1889"
- transform="translate(388.9491,122.6895)"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1891"><rect
- id="rect1893"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1895">HelloWorld</flowPara><flowPara
- id="flowPara1897">Service</flowPara><flowPara
- id="flowPara1899" /></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 567.85714,349.09448 C 666.42857,348.3802 666.42857,348.3802 666.42857,348.3802"
- id="path1901" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/pom.xml b/branches/sca-java-0.99/samples/helloworld-ws-reference/pom.xml
deleted file mode 100644
index e2729e1815..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-ws-reference</artifactId>
- <name>Apache Tuscany HelloWorld Web Service Client Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sample-helloworld-ws-service</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index 4559b282fe..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.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 org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the HelloWorld service and invoke it.
- */
-public class HelloWorldClient {
-
- public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
- HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-
- String value = helloWorldService.getGreetings("World");
- System.out.println(value);
-
- scaDomain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 433a98fd7f..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-@Service
-public interface HelloWorldService {
- public String getGreetings(String name);
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 0dee19550b..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package helloworld;
-
-/**
- * The HelloWorld service implementation
- */
-public class HelloWorldServiceComponent implements HelloWorldService {
-
- HelloWorldService helloWorldService;
-
- public String getGreetings(String name) {
- System.out.println("Called getGreetings");
- return helloWorldService.getGreetings(name);
- }
-
- public HelloWorldService getHelloWorldService() {
- System.out.println("Got Injected helloWorldService");
- return helloWorldService;
- }
-
- public void setHelloWorldService(HelloWorldService helloWorldService) {
- System.out.println("Injected helloWorldService");
- this.helloWorldService = helloWorldService;
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index 899ad5ce35..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://helloworld"
- xmlns:hw="http://helloworld"
- name="helloworldwsclient">
-
- <!-- A component with an embedded reference definition connecting to an external webservice
- The wsdl interface for the reference is derived from the information specified by the 'wsdlElement'
- -->
- <component name="HelloTuscanyServiceComponent">
- <implementation.java class="helloworld.HelloWorldServiceComponent"/>
- <reference name="helloWorldService">
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
- </reference>
- </component>
-
- <!-- A component with a reference promoted as a composite reference -->
- <component name="HelloWorldServiceComponent">
- <implementation.java class="helloworld.HelloWorldServiceComponent"/>
- </component>
-
- <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService">
- <interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/logging.properties b/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/logging.properties
+++ /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.
-#
-# $Rev$ $Date$
-#
-
-# Custom logging configuration for Tuscany samples
-# By default, only INFO level logging is enabled and ALL messages get sent to the console
-# For more messages from the runtime, uncomment specific settings at the end of this file
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-.level=INFO
-
-# Uncomment the next setting to get all Tuscany messages (this will be a lot)
-#org.apache.tuscany.level=FINEST
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 1e468bc9ca..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="helloworld">
-
- <wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <element name="getGreetings">
- <complexType>
- <sequence>
- <element name="name" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- </schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetingsRequest">
- <wsdl:part element="tns:getGreetings" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getGreetingsResponse">
- <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
- </wsdl:message>
-
- <wsdl:portType name="HelloWorld">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
- <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="HelloWorldService">
- <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 7ce89179c2..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package helloworld;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test case for helloworld web service client
- */
-public class HelloWorldClientTestCase {
-
- private HelloWorldService helloWorldService;
- private HelloWorldService helloTuscanyService;
- private SCADomain scaDomain;
-
- private SCATestCaseRunner server;
-
- @Before
- public void startClient() throws Exception {
- try {
- scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
- helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
- helloTuscanyService = scaDomain.getService(HelloWorldService.class, "HelloTuscanyServiceComponent");
-
- server = new SCATestCaseRunner(HelloWorldTestServer.class);
- server.before();
-
- } catch (Throwable e) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testWSClient() throws Exception {
- String msg = helloWorldService.getGreetings("Smith");
- Assert.assertEquals("Hello Smith", msg);
- }
-
- @Test
- public void testEmbeddedReferenceClient() throws Exception {
- String msg = helloTuscanyService.getGreetings("Tuscany");
- Assert.assertEquals("Hello Tuscany", msg);
- }
-
- @After
- public void stopClient() throws Exception {
- server.after();
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 4b0c40dafd..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package helloworld;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Starts up the SCA runtime which starts listening for service requests
- */
-public class HelloWorldTestServer {
-
- private SCADomain scaDomain;
-
- @Before
- public void startServer() throws Exception {
- try {
- scaDomain = SCADomain.newInstance("helloworldws.composite");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
- @After
- public void stopServer() throws Exception {
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/README b/branches/sca-java-0.99/samples/helloworld-ws-sdo/README
deleted file mode 100644
index 3689f79149..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/README
+++ /dev/null
@@ -1,210 +0,0 @@
-Hello World Web Service References Sample
-=========================================
-This sample demonstrates an SCA reference that uses a web service binding which works with SDO.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens, you need to run the server first
-so open a command prompt, navigate to the helloworld-ws-service sample directory
-and do
-
-ant run-server
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-sdo.jar helloworld-ws-sdo.HelloWorldServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-sdo.jar helloworld-ws-sdo.HelloWorldServer
-
-You should see the following output:
-
-Buildfile: build.xml
-
-run-server:
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] Aug 24, 2007 11:17:33 AM org.apache.catalina.core.StandardEngine sta
-rt
- [java] INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.ContextConfig d
-efaultWebConfig
- [java] INFO: No default web.xml
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
- register
- [java] WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.
-xsd
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
- register
- [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt
-aglibrary_1_1.dtd
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
- register
- [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt
-aglibrary_1_2.dtd
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
- register
- [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt
-aglibrary_2_0.xsd
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
- register
- [java] WARNING: Could not get url for /javax/servlet/resources/j2ee_web_ser
-vices_1_1.xsd
- [java] Aug 24, 2007 11:17:34 AM org.apache.coyote.http11.Http11Protocol ini
-t
- [java] INFO: Initializing Coyote HTTP/1.1 on http-8085
- [java] Aug 24, 2007 11:17:34 AM org.apache.coyote.http11.Http11Protocol sta
-rt
- [java] INFO: Starting Coyote HTTP/1.1 on http-8085
- [java] Aug 24, 2007 11:17:34 AM org.apache.tuscany.sca.http.tomcat.TomcatSe
-rver addServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8085/HelloWorldService
-
- [java] HelloWorld server started (press enter to shutdown)
-
-The server is now ready.
-
-Then open another command window to run the client:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-sdo.jar helloworld-ws-sdo.HelloWorldClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-sdo.jar helloworld-ws-sdo.HelloWorldClient
-
-You should be able to see the following result:
-
-Buildfile: build.xml
-
-run:
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] Injected helloWorldService
- [java] Called getGreetings
- [java] Hello David Haney
-
-BUILD SUCCESSFUL
-Total time: 9 seconds
-
-
-Sample Overview
----------------
-The sample provides a single component that is wired to a reference with a
-web service binding. The binding refers to WSDL that identifies the service
-exposed by the helloworld-ws-service sample.
-
-helloworld-ws-sdo/
- src/
- main/
- java/
- helloworld/
- HelloWorldService.java - interface description for
- HelloWorldServiceComponent
- HelloWorldServiceComponent.java - component implementation
- HelloWorldClient.java - starts the SCA Runtime and
- deploys the helloworldwsclient
- .composite. It then calls the
- HelloWorldServiceComponent
- resources/
- wsdl
- helloworld.wsdl - the service description that the
- SCA reference uses to bind to service.
-
- test/
- java/
- helloworld/
- HelloWorldClientTestCase.java - JUnit test case
- helloworld-ws-sdo.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant. Before
-you do this start up the service that the reference will talk to. To do this
-run up the helloworld-ws-service test. Take a look at the README in that sample
-and you will see you need the following commands
-
-cd helloworld-ws-sdo
-ant
-
-
-You should see the following output from the run target.
-
-run:
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] Injected helloWorldService
- [java] Called getGreetings
- [java] Hello World
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows. When using Maven you don't need to run the helloworld-
-ws-service sample first as Maven does this for you.
-
-cd helloworld-ws-sdo
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldClientTestCase
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX
-Utils).
-log4j:WARN Please initialize the log4j system properly.
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX
-Utils).
-log4j:WARN Please initialize the log4j system properly.
-Aug 23, 2007 2:27:32 PM org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.ContextConfig defaultWebConf
-ig
-INFO: No default web.xml
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_
-1.dtd
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_
-2.dtd
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-Aug 23, 2007 2:27:32 PM org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-Aug 23, 2007 2:27:32 PM org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-Aug 23, 2007 2:27:32 PM org.apache.tuscany.sca.http.tomcat.TomcatServer addServl
-etMapping
-INFO: Added Servlet mapping: http://localhost:8085/HelloWorldService
-Injected helloWorldService
-Called getGreetings
-Aug 23, 2007 2:27:34 PM org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.502 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/build.xml b/branches/sca-java-0.99/samples/helloworld-ws-sdo/build.xml
deleted file mode 100644
index 401315d424..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/build.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="helloworld-ws-sdo" default="compile" basedir=".">
- <property file="${user.home}/tuscany/build.properties" />
- <property file="${user.home}/build.properties" />
-
- <property name="server.class" value="helloworld.HelloWorldServer" />
- <property name="client.class" value="helloworld.HelloWorldClient" />
- <property name="test.jar" value="sample-helloworld-ws-sdo.jar" />
-
- <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
-
- <target name="init">
- <mkdir dir="target/classes"/>
- <mkdir dir="target/sdo-source"/>
- </target>
-
- <path id="project.classpath">
- <pathelement path="target/classes"/>
- <pathelement path="target/sdo-source"/>
- <pathelement location="${tuscany.sca.manifest.location}"/>
- </path>
-
- <target name="generate-sdo" depends="init">
- <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">
- <arg value="-targetDirectory"/>
- <arg value="target/sdo-source"/>
- <arg value="-javaPackage"/>
- <arg value="helloworld"/>
- <arg value="-prefix"/>
- <arg value="Helloworld"/>
- <arg value="-noNotification"/>
- <arg value="-noContainment"/>
- <arg value="-noUnsettable"/>
- <arg value="src/main/resources/wsdl/helloworld.wsdl"/>
-
- <classpath refid="project.classpath"/>
- </java>
- </target>
-
- <target name="compile" depends="init, generate-sdo">
- <javac destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <src location="src/main/java"/>
- <src location="target/sdo-source"/>
- <classpath refid="project.classpath"/>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- <fileset dir="target/sdo-source"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${client.class}" fork="true">
- <classpath refid="project.classpath"/> </java>
- </target>
-
- <target name="run-server">
- <java classname="${server.class}" fork="true">
- <classpath path="target/${test.jar}"/>
- <classpath refid="project.classpath"/>
- </java>
- </target>
-
- <target name="run">
- <java classname="${client.class}" fork="true">
- <classpath path="target/${test.jar}"/>
- <classpath refid="project.classpath"/>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
deleted file mode 100644
index 333ad53e0a..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference"
- sodipodi:docname="helloworld-ws-reference.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="519.38407"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="85"
- inkscape:window-y="295" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(0.991389,0,0,1,2.215655,0)">
- <rect
- rx="13.79423"
- ry="12.692303"
- y="192.00233"
- x="258.3114"
- height="299.99988"
- width="446.72086"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">helloworldwsclient</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="432.05917"
- y="307.1676"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(172.4684,115.2291)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">HelloWorld</flowPara><flowPara
- id="flowPara1883">Service</flowPara><flowPara
- id="flowPara1885">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 528.16111,337.17632 L 561.49615,337.17632 L 567.55706,350.3083 L 560.486,362.43014 L 528.16111,362.43014 L 535.73726,350.3083 L 528.16111,337.17632 z "
- id="path3019" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 651.01647,320.75333 L 718.80207,320.75333 L 731.12672,349.11387 L 716.74797,375.29287 L 651.01647,375.29287 L 666.4223,349.11387 L 651.01647,320.75333 z "
- id="path1887" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1889"
- transform="translate(388.9491,122.6895)"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1891"><rect
- id="rect1893"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1895">HelloWorld</flowPara><flowPara
- id="flowPara1897">Service</flowPara><flowPara
- id="flowPara1899" /></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 567.85714,349.09448 C 666.42857,348.3802 666.42857,348.3802 666.42857,348.3802"
- id="path1901" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/pom.xml b/branches/sca-java-0.99/samples/helloworld-ws-sdo/pom.xml
deleted file mode 100644
index bd0d513a86..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/pom.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-ws-sdo</artifactId>
- <name>Apache Tuscany HelloWorld Web Service SDO Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-lib</artifactId>
- <version>1.0-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-http-tomcat</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/sdo-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating</version>
- <executions>
- <execution>
- <id>generate-helloworld-sdo</id>
- <phase>generate-sources</phase>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/wsdl/helloworld.wsdl</schemaFile>
- <javaPackage>helloworld</javaPackage>
- <prefix>Helloworld</prefix>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index de4795ceaf..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it, locate the
- * HelloWorld service and invoke it.
- */
-public class HelloWorldClient {
-
- public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
- HelloWorldService helloWorldService =
- scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-
- Name name = HelloworldFactory.INSTANCE.createName();
-
- name.setFirst("David");
- name.setLast("Haney");
-
- String value = helloWorldService.getGreetings(name);
- System.out.println(value);
-
- scaDomain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index c950f7df04..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/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(Name name) {
- return "Hello " + name.getFirst() + " " + name.getLast();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index e03ed4dc25..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/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-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index e9e39aa1dc..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-@Service
-public interface HelloWorldService {
- public String getGreetings(Name name);
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 711eef63b5..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package helloworld;
-
-/**
- * The HelloWorld service implementation
- */
-public class HelloWorldServiceComponent implements HelloWorldService {
-
- HelloWorldService helloWorldService;
-
- public String getGreetings(Name name) {
- System.out.println("Called getGreetings");
- return helloWorldService.getGreetings(name);
- }
-
- public HelloWorldService getHelloWorldService() {
- System.out.println("Got Injected helloWorldService");
- return helloWorldService;
- }
-
- public void setHelloWorldService(HelloWorldService helloWorldService) {
- System.out.println("Injected helloWorldService");
- this.helloWorldService = helloWorldService;
- }
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
deleted file mode 100644
index e8f45d2901..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://helloworld"
- xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:hw="http://helloworld"
- name="helloworldws">
-
- <!-- dbsdo:import.sdo factory="helloworld.HelloworldFactory" / -->
-
- <component name="HelloWorldServiceComponent">
- <service name="HelloWorldService">
- <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws uri="http://localhost:8085/HelloWorldService" />
- </service>
- <implementation.java class="helloworld.HelloWorldImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index 34db47e04d..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://helloworld"
- xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:hw="http://helloworld"
- name="helloworldwsclient">
-
- <!-- dbsdo:import.sdo factory="helloworld.HelloworldFactory" / -->
-
- <component name="HelloWorldServiceComponent">
- <implementation.java class="helloworld.HelloWorldServiceComponent" />
- </component>
-
- <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService">
- <interface.java interface="helloworld.HelloWorldService" />
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ /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.
-#
-# $Rev$ $Date$
-#
-
-# Custom logging configuration for Tuscany samples
-# By default, only INFO level logging is enabled and ALL messages get sent to the console
-# For more messages from the runtime, uncomment specific settings at the end of this file
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-.level=INFO
-
-# Uncomment the next setting to get all Tuscany messages (this will be a lot)
-#org.apache.tuscany.level=FINEST
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 2ecc0bea43..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">
-
- <wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld"
- xmlns="http://www.w3.org/2001/XMLSchema">
-
- <element name="getGreetings">
- <complexType>
- <sequence>
- <element name="name" type="tns:Name" />
- </sequence>
- </complexType>
- </element>
-
- <element name="getGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getGreetingsReturn" type="xsd:string" />
- </sequence>
- </complexType>
- </element>
-
- <complexType name="Name">
- <sequence>
- <element name="first" type="xsd:string" />
- <element name="last" type="xsd:string" />
- </sequence>
- </complexType>
-
- </schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetingsRequest">
- <wsdl:part element="tns:getGreetings" name="parameters" />
- </wsdl:message>
-
- <wsdl:message name="getGreetingsResponse">
- <wsdl:part element="tns:getGreetingsResponse" name="parameters" />
- </wsdl:message>
-
- <wsdl:portType name="HelloWorld">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />
- <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction="" />
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal" />
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="HelloWorldService">
- <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8085/HelloWorldService" />
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 11564c370f..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package helloworld;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test case for helloworld web service client
- */
-public class HelloWorldClientTestCase {
-
- private HelloWorldService helloWorldService;
- private SCADomain scaDomain;
-
- private SCATestCaseRunner server;
-
- @Before
- public void startClient() throws Exception {
- try {
- scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
- helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
-
- server = new SCATestCaseRunner(HelloWorldTestServer.class);
- server.before();
-
- } catch (Throwable e) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testWSClient() throws Exception {
- Name name = HelloworldFactory.INSTANCE.createName();
- name.setFirst("John");
- name.setLast("Smith");
- String msg = helloWorldService.getGreetings(name);
- Assert.assertEquals("Hello John Smith", msg);
- }
-
- @After
- public void stopClient() throws Exception {
- server.after();
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 4b0c40dafd..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package helloworld;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Starts up the SCA runtime which starts listening for service requests
- */
-public class HelloWorldTestServer {
-
- private SCADomain scaDomain;
-
- @Before
- public void startServer() throws Exception {
- try {
- scaDomain = SCADomain.newInstance("helloworldws.composite");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
- @After
- public void stopServer() throws Exception {
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/README b/branches/sca-java-0.99/samples/helloworld-ws-service/README
deleted file mode 100644
index b82d5bd329..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/README
+++ /dev/null
@@ -1,132 +0,0 @@
-Hello World Web Service Service Sample
-======================================
-This sample demonstrates an SCA service that uses a web service binding.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-Now the server is started you can use the helloworld-ws-reference sample to
-exercise it.
-
-Sample Overview
----------------
-The sample provides a single component that is wired to a service with a
-web service binding.
-
-helloworld-ws-service/
- src/
- main/
- java/
- helloworld/
- HelloWorldService.java - interface description for
- HelloWorldServiceComponent
- HelloWorldImpl.java - component implementation
- HelloWorldServer.java - starts the SCA Runtime and
- deploys the helloworldws
- .composite and then waits for the
- service to be called via web services
- resources/
- wsdl/
- helloworld.wsdl - the service description that describes
- the exposed service
- helloworldws.composite - the SCA assembly for this sample
- test/
- java/
- helloworld/
- HelloWorldServerTestCase.java - JUnit test case
- helloworld-ws-service.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant using the
-following commands
-
-cd helloworld-ws-service
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] HelloWorld server started (press enter to shutdown)
-
-As this point the SCA service is exposed as a web service by a web server
-started automatically by the SCA runtime. To stop the server just press
-enter.
-
-To exercise the service run up the helloworld-ws-reference sample. Take a look at
-the README in that sample and you will see you need the following commands
-
-cd helloworld-ws-reference
-ant run
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows. When using Maven you don't need to run the helloworld-
-ws-reference sample as Maven includes a simple ping test to make sure that the
-service is available
-
-cd helloworld-ws-service
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldServerTestCase
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX
-Utils).
-log4j:WARN Please initialize the log4j system properly.
-10-May-2007 13:48:42 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-10-May-2007 13:48:42 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-10-May-2007 13:48:42 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-10-May-2007 13:48:42 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_
-1.dtd
-10-May-2007 13:48:42 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_
-2.dtd
-10-May-2007 13:48:42 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-10-May-2007 13:48:42 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-10-May-2007 13:48:43 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-10-May-2007 13:48:43 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-10-May-2007 13:48:43 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.857 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/build.xml b/branches/sca-java-0.99/samples/helloworld-ws-service/build.xml
deleted file mode 100644
index 46678febc3..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="helloworld-ws-service" default="compile">
- <property name="test.class" value="helloworld.HelloWorldServer" />
- <property name="test.jar" value="sample-helloworld-ws-service.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.png b/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.png
deleted file mode 100644
index 6f7d9dd450..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.svg b/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.svg
deleted file mode 100644
index 3305faeed8..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/helloworld-ws-service.svg
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service"
- sodipodi:docname="helloworld-ws-service.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="519.38407"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="573"
- inkscape:window-x="117"
- inkscape:window-y="316" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(0.991389,0,0,1,2.215655,0)">
- <rect
- rx="13.79423"
- ry="12.692303"
- y="192.00233"
- x="258.3114"
- height="299.99988"
- width="446.72086"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">helloworldws</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="432.05917"
- y="307.1676"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(172.4684,115.2291)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">HelloWorld</flowPara><flowPara
- id="flowPara1883">Service</flowPara><flowPara
- id="flowPara1885">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "
- id="path3017" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 226.73064,320.75315 L 293.91185,320.75315 L 306.1266,352.82797 L 291.87606,382.43553 L 226.73064,382.43553 L 241.99911,352.82797 L 226.73064,320.75315 z "
- id="path1892" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1894"
- transform="translate(-37.47944,122.8324)"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1896"><rect
- id="rect1898"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1900">HelloWorld</flowPara><flowPara
- id="flowPara1906">Web</flowPara><flowPara
- id="flowPara1904">Service</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 305.71429,353.3802 L 422.85714,351.95163"
- id="path1910"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/pom.xml b/branches/sca-java-0.99/samples/helloworld-ws-service/pom.xml
deleted file mode 100644
index 501d212aeb..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-ws-service</artifactId>
- <name>Apache Tuscany HelloWorld Web Service Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-http-tomcat</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0de3c70303..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/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-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index e03ed4dc25..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/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-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index bd527ff8e2..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-@Service
-public interface HelloWorldService {
-
- public String getGreetings(String name);
-}
-
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/helloworldws.composite b/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
deleted file mode 100644
index 76ccf71fb8..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://helloworld"
- xmlns:hw="http://helloworld"
- name="helloworldws">
-
- <component name="HelloWorldServiceComponent">
- <service name="HelloWorldService">
- <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws uri="http://localhost:8085/HelloWorldService"/>
- </service>
- <implementation.java class="helloworld.HelloWorldImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 454763410c..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="helloworld">
-
- <wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <element name="getGreetings">
- <complexType>
- <sequence>
- <element name="name" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- </schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetingsRequest">
- <wsdl:part element="tns:getGreetings" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getGreetingsResponse">
- <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
- </wsdl:message>
-
- <wsdl:portType name="HelloWorld">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
- <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="HelloWorldService">
- <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-java-0.99/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/branches/sca-java-0.99/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
deleted file mode 100644
index 99c1f4d799..0000000000
--- a/branches/sca-java-0.99/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.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 helloworld;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that the helloworld server is available
- */
-public class HelloWorldServerTestCase{
-
- private SCADomain scaDomain;
-
- @Before
- public void startServer() throws Exception {
- scaDomain = SCADomain.newInstance("helloworldws.composite");
- }
-
- @Test
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
- @Test
- public void testServiceCall() throws IOException {
- HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");
- assertNotNull(helloWorldService);
-
- assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
- }
-
- @After
- public void stopServer() throws Exception {
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-composite/README b/branches/sca-java-0.99/samples/implementation-composite/README
deleted file mode 100644
index 27de00e8ef..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/README
+++ /dev/null
@@ -1,116 +0,0 @@
-Composite Implementation Sample
-===============================
-
-This sample shows how composites can be used to implement components.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-implementation-composite.jar composite.CompositeClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-implementation-composite.jar composite.CompositeClient
-
-
-Sample Overview
----------------
-
-The sample is comprised of three composites. Take a look at the composite file
-or the .svg/.png file which shows the composite file in pictorial form. The
-OuterComposite defines three components two of which are implemented using
-composites. The SourceComponent calls each TargetComponent in turn. There is a
-callback which returns from each TargetComponent to the SourceComponent.
-
-implementation-composite/
- src/
- main/
- java/
- composite/
- Source.java - interface for the source component
- SourceImpl.java - implementation for the source component
- SourceCallback.java - source component callback interface
- Target.java - interface for the target component
- TargetImpl.java - implementation for the target component
- CompositeClient.java - starts the SCA Runtime and
- deploys the OuterComposite.composite.
- This in turn pulls in the two inner
- composites
- resources/
- META-INF/
- sca-contribution.xml - specifies the composite to be deployed
- OuterComposite.composite - the top level SCA assembly for this sample
- InnerComposite.composite - included by OuterComposite.composite
- InnerComposite2.composite - included by OuterComposite.composite
- test/
- java/
- composite/
- CompositeTestCase.java - JUnit test case
- implementation-composite.png - a pictorial representation of the sample
- .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd implementation-composite
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Main thread Thread[main,5,main]
- [java] Source: Client.main -> Source.clientMethod
- [java] Source: Client.main => Source.clientMethod2
- [java] Sleeping ...
- [java] Target: Client.main -> Source.clientMethod
- [java] Work thread Thread[pool-1-thread-1,5,main]
- [java] Result: Client.main -> Source.clientMethod -> Target.someMethod
- [java] Target: Client.main => Source.clientMethod2
- [java] Work thread Thread[pool-1-thread-2,5,main]
- [java] Result: Client.main => Source.clientMethod2 -> Target.someMethod
-
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd implementation-composite
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running composite.CompositeTestCase
-Main thread Thread[main,5,main]
-Source: Client.main -> Source.clientMethod
-Source: Client.main => Source.clientMethod2
-Sleeping ...
-Target: Client.main => Source.clientMethod2
-Work thread Thread[pool-1-thread-2,5,main]
-Result: Client.main => Source.clientMethod2 -> Target.someMethod
-Target: Client.main -> Source.clientMethod
-Work thread Thread[pool-1-thread-1,5,main]
-Result: Client.main -> Source.clientMethod -> Target.someMethod
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.973 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/implementation-composite/build.xml b/branches/sca-java-0.99/samples/implementation-composite/build.xml
deleted file mode 100644
index 7aa31aab8b..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="implementation-composite" default="compile">
- <property name="test.class" value="composite.CompositeClient" />
- <property name="test.jar" value="sample-implementation-composite.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.png b/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.png
deleted file mode 100644
index 4c6d71bc03..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.svg b/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.svg
deleted file mode 100644
index 0e60354aab..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/implementation-composite.svg
+++ /dev/null
@@ -1,658 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\composite-impl"
- sodipodi:docname="composite-impl.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\composite-impl\composite-impl.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4">
- <marker
- inkscape:stockid="TriangleOutL"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="TriangleOutL"
- style="overflow:visible">
- <path
- id="path3199"
- d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
- transform="scale(0.8)" />
- </marker>
- <marker
- inkscape:stockid="TriangleInL"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="TriangleInL"
- style="overflow:visible">
- <path
- id="path3208"
- d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
- style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
- transform="scale(-0.8)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lstart"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="Arrow2Lstart"
- style="overflow:visible">
- <path
- id="path3279"
- style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
- d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
- transform="scale(1.1) translate(1,0)" />
- </marker>
- <marker
- inkscape:stockid="Arrow2Lend"
- orient="auto"
- refY="0.0"
- refX="0.0"
- id="Arrow2Lend"
- style="overflow:visible;">
- <path
- id="path3276"
- style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
- d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
- transform="scale(1.1) rotate(180) translate(1,0)" />
- </marker>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.98994949"
- inkscape:cx="422.9821"
- inkscape:cy="472.08096"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1163"
- inkscape:window-height="727"
- inkscape:window-x="49"
- inkscape:window-y="142" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <rect
- style="fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00000072;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2067"
- width="437.12573"
- height="235.3502"
- x="322.71631"
- y="54.621651"
- ry="9.9571238"
- rx="13.497943" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2954"
- transform="translate(52.97608,-147.3808)"><flowRegion
- id="flowRegion2956"><rect
- id="rect2958"
- width="195.71428"
- height="21.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2960">OuterComposite </flowPara></flowRoot> <rect
- style="fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3038"
- width="387.65787"
- height="235.3502"
- x="90.543831"
- y="383.98276"
- ry="9.9571238"
- rx="11.970432" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3040"
- transform="translate(-176.3391,188.4089)"><flowRegion
- id="flowRegion3042"><rect
- id="rect3044"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3046">InnerComposite</flowPara></flowRoot> <rect
- style="fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00000048;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3048"
- width="324.99875"
- height="235.3502"
- x="555.21411"
- y="379.94214"
- ry="9.9571238"
- rx="10.03559" />
- <rect
- style="opacity:1;fill:none;fill-opacity:1;stroke:#060000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3050"
- width="501.42856"
- height="300"
- x="281.42856"
- y="25.523054"
- rx="2.4997854"
- ry="0" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3052"
- transform="translate(14.49567,-180.4534)"><flowRegion
- id="flowRegion3054"><rect
- id="rect3056"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3058">OuterComposite.composite</flowPara></flowRoot> <rect
- style="opacity:1;fill:none;fill-opacity:1;stroke:#060000;stroke-width:1.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6.00000127, 1.0000002;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3060"
- width="469.99997"
- height="277.14301"
- x="34.999977"
- y="355.52322"
- rx="2.3431036"
- ry="0" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3062"
- transform="translate(-231.9329,149.5466)"><flowRegion
- id="flowRegion3064"><rect
- id="rect3066"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3068">InnerComposite.composite</flowPara></flowRoot> <rect
- style="opacity:1;fill:none;fill-opacity:1;stroke:#060000;stroke-width:1.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6.00000217, 1.00000036;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3070"
- width="370.06677"
- height="277.14301"
- x="526.42865"
- y="355.52322"
- rx="1.8449039"
- ry="0" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3072"
- transform="translate(259.4957,149.5466)"><flowRegion
- id="flowRegion3074"><rect
- id="rect3076"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3078">InnerComposite2.composite</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3080"
- width="115.66247"
- height="107.29153"
- x="339.39774"
- y="120.88454"
- rx="6.9961648"
- ry="8.9006968" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3082"
- transform="translate(61.09274,-82.91111)"><flowRegion
- id="flowRegion3084"><rect
- id="rect3086"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3088">SourceComponent</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 419.07104,149.4647 L 471.74673,149.4647 L 481.32412,162.59667 L 470.1505,174.71851 L 419.07104,174.71851 L 431.04279,162.59667 L 419.07104,149.4647 z "
- id="path3094" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 417.44485,192.18187 L 470.12055,192.18187 L 479.69794,205.31384 L 468.52432,217.43568 L 417.44485,217.43568 L 429.41661,205.31384 L 417.44485,192.18187 z "
- id="path3096" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3098"
- transform="matrix(0.588577,0,0,0.522806,267.0549,40.55827)"><flowRegion
- id="flowRegion3100"><rect
- id="rect3102"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3104">Target</flowPara><flowPara
- id="flowPara3106">Component</flowPara><flowPara
- id="flowPara3108">Ref</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot3110"
- transform="matrix(0.588577,0,0,0.522806,266.7932,82.35649)"><flowRegion
- id="flowRegion3112"><rect
- id="rect3114"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3116">Target</flowPara><flowPara
- id="flowPara3118">Component</flowPara><flowPara
- id="flowPara3120">Ref2</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0"
- d="M 386.42857,191.23734 L 272.85714,354.80877"
- id="path3304" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3306"
- width="122.73349"
- height="85.862968"
- x="521.41876"
- y="82.620422"
- rx="7.4238753"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3308"
- transform="translate(243.9718,-121.6444)"><flowRegion
- id="flowRegion3310"><rect
- id="rect3312"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3314">TargetComponent</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 508.55406,120.18171 L 546.16282,120.18171 L 553.00077,133.31368 L 545.02316,145.43552 L 508.55406,145.43552 L 517.10151,133.31368 L 508.55406,120.18171 z "
- id="path3318" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000048;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3322"
- width="124.75388"
- height="85.862968"
- x="625.0321"
- y="185.9852"
- rx="7.5460844"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3324"
- transform="translate(347.5847,-18.27962)"><flowRegion
- id="flowRegion3326"><rect
- id="rect3328"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3330">TargetComponent2</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0"
- d="M 675.79205,235.98775 L 764.68548,355.18575"
- id="path3336" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
- d="M 481.33769,161.74154 L 496.99505,161.74154 L 496.99505,134.46742 L 515.1778,134.46742"
- id="path3362" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 67.175117,493.80686 L 112.47656,493.80686 L 120.71318,512.19162 L 111.1038,529.1622 L 67.175117,529.1622 L 77.470908,512.19162 L 67.175117,493.80686 z "
- id="path3364" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3366"
- transform="matrix(0.764739,0,0,0.753419,-137.1237,335.169)"><flowRegion
- id="flowRegion3368"><rect
- id="rect3370"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3372">Inner</flowPara><flowPara
- id="flowPara3374">Source</flowPara><flowPara
- id="flowPara3376">Service</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3378"
- width="115.66247"
- height="123.2386"
- x="222.2549"
- y="461.59875"
- rx="6.9961648"
- ry="10.223635" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3380"
- transform="translate(-41.0501,252.8032)"><flowRegion
- id="flowRegion3382"><rect
- id="rect3384"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3386">InnerSource</flowPara><flowPara
- id="flowPara3398">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 207.36974,499.16011 L 246.68799,499.16011 L 253.83675,512.29208 L 245.49653,524.41392 L 207.36974,524.41392 L 216.30571,512.29208 L 207.36974,499.16011 z "
- id="path3390" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 458.45503,498.7504 L 491.79007,498.7504 L 497.85098,511.88237 L 490.77992,524.00421 L 458.45503,524.00421 L 466.03118,511.88237 L 458.45503,498.7504 z "
- id="path3394" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 457.8633,539.5488 L 491.19834,539.5488 L 497.25925,552.68077 L 490.18819,564.80261 L 457.8633,564.80261 L 465.43945,552.68077 L 457.8633,539.5488 z "
- id="path3396" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
- d="M 121.21831,512.76955 L 214.15234,512.76955"
- id="path3402" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 313.13842,496.9668 L 365.81411,496.9668 L 375.3915,510.09877 L 364.21788,522.22061 L 313.13842,522.22061 L 325.11017,510.09877 L 313.13842,496.9668 z "
- id="path3428" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 311.51223,539.68397 L 364.18793,539.68397 L 373.76532,552.81594 L 362.5917,564.93778 L 311.51223,564.93778 L 323.48399,552.81594 L 311.51223,539.68397 z "
- id="path3430" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3432"
- transform="matrix(0.588577,0,0,0.522806,161.1223,388.0604)"><flowRegion
- id="flowRegion3434"><rect
- id="rect3436"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3438">Target</flowPara><flowPara
- id="flowPara3440">Component</flowPara><flowPara
- id="flowPara3442">Ref</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot3444"
- transform="matrix(0.588577,0,0,0.522806,160.8606,429.8586)"><flowRegion
- id="flowRegion3446"><rect
- id="rect3448"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3450">Target</flowPara><flowPara
- id="flowPara3452">Component</flowPara><flowPara
- id="flowPara3454">Ref2</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
- d="M 375,509.80877 L 465,510.52305"
- id="path3456" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
- d="M 374.28571,553.3802 L 465,553.3802"
- id="path3458" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3460"
- transform="matrix(0.768159,0,0,0.869201,176.2162,311.7866)"><flowRegion
- id="flowRegion3462"><rect
- id="rect3464"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3466">promote</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot3468"
- transform="matrix(0.768159,0,0,0.869201,176.8981,355.7265)"><flowRegion
- id="flowRegion3470"><rect
- id="rect3472"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3474">promote</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 538.20382,492.4365 L 583.50526,492.4365 L 591.74188,510.82126 L 582.1325,527.79184 L 538.20382,527.79184 L 548.49961,510.82126 L 538.20382,492.4365 z "
- id="path3476" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3478"
- transform="matrix(0.764739,0,0,0.753419,333.905,333.7986)"><flowRegion
- id="flowRegion3480"><rect
- id="rect3482"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3484">Inner</flowPara><flowPara
- id="flowPara3486">Target</flowPara><flowPara
- id="flowPara3488">Service</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000048;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3490"
- width="124.75388"
- height="85.862968"
- x="698.64941"
- y="459.73654"
- rx="7.5460844"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3492"
- transform="translate(445.4456,256.4819)"><flowRegion
- id="flowRegion3494"><rect
- id="rect3496"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3498">InnerTarget</flowPara><flowPara
- id="flowPara3502">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 677.53028,495.80598 L 714.4917,495.80598 L 721.21196,510.79509 L 713.37166,524.63121 L 677.53028,524.63121 L 685.93061,510.79509 L 677.53028,495.80598 z "
- id="path3500" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 916.90199,189.64981 L 1002.9382,189.64981 C 1002.9382,189.64981 1002.9382,235.81944 1002.9382,235.81944 C 989.62313,237.57221 976.30803,237.62595 962.99289,245.41312 C 953.65801,255.66964 935.10151,255.12922 917.92625,256.20602 L 916.90199,189.64981 z "
- id="path3504"
- sodipodi:nodetypes="cccccc" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3506"
- transform="translate(646.5141,-15.23667)"><flowRegion
- id="flowRegion3508"><rect
- id="rect3510"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3514">TargetImpl</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot3522"
- transform="matrix(0.764739,0,0,0.753419,471.6381,345.0856)"><flowRegion
- id="flowRegion3524"><rect
- id="rect3526"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3532">Target</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
- d="M 590.71429,511.23734 L 685,511.23734"
- id="path3538" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 918.41044,67.959238 L 1004.4467,67.959238 C 1004.4467,67.959238 1004.4467,114.12887 1004.4467,114.12887 C 991.13163,115.88164 977.81652,115.93538 964.50132,123.72255 C 955.16646,133.97907 936.60996,133.43865 919.4347,134.51545 L 918.41044,67.959238 z "
- id="path3576"
- sodipodi:nodetypes="cccccc" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3578"
- transform="translate(648.0226,-136.9272)"><flowRegion
- id="flowRegion3580"><rect
- id="rect3582"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3584">Target</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-mid:url(#TriangleInL);stroke-opacity:1"
- d="M 961.42857,126.95163 L 961.42857,162.66591 L 961.42857,191.23734"
- id="path3594" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 76.22763,193.09023 L 162.2639,193.09023 C 162.2639,193.09023 162.2639,239.25986 162.2639,239.25986 C 148.9488,241.01263 135.6337,241.06637 122.3185,248.85354 C 112.98365,259.11006 94.42715,258.56964 77.25189,259.64644 L 76.22763,193.09023 z "
- id="path3600"
- sodipodi:nodetypes="cccccc" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3602"
- transform="translate(-194.1602,-11.79626)"><flowRegion
- id="flowRegion3604"><rect
- id="rect3606"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3608">SourceImpl</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 14.878937,64.256802 L 100.91526,64.256802 C 100.91526,64.256802 100.91526,110.42643 100.91526,110.42643 C 87.600157,112.1792 74.285057,112.23294 60.969857,120.02011 C 51.634957,130.27663 33.078457,129.73621 15.903197,130.81301 L 14.878937,64.256802 z "
- id="path3610"
- sodipodi:nodetypes="cccccc" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3612"
- transform="translate(-255.5088,-140.6297)"><flowRegion
- id="flowRegion3614"><rect
- id="rect3616"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3618">Source</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 140.55329,63.673523 L 239.44669,63.673523 C 239.44669,63.673523 239.44669,109.84315 239.44669,109.84315 C 224.14179,111.59592 208.83699,111.64966 193.53189,119.43683 C 182.80209,129.69335 161.47249,129.15293 141.73059,130.22973 L 140.55329,63.673523 z "
- id="path3622"
- sodipodi:nodetypes="cccccc" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3624"
- transform="translate(-135.5491,-141.213)"><flowRegion
- id="flowRegion3626"><rect
- id="rect3628"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3630">SourceCallback</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-mid:url(#TriangleOutL)"
- d="M 108.08632,192.55119 L 77.781746,156.1857 L 51.51778,123.86082"
- id="path3634" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-mid:url(#TriangleOutL)"
- d="M 130.30968,192.55119 L 161.62441,159.21616 L 201.02036,117.7999"
- id="path3636" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"
- d="M 800,511.23734 L 917.14286,238.3802"
- id="path3640" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,1;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"
- d="M 610,125.52305 L 915.71429,216.95163"
- id="path3646" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:6,1;stroke-dashoffset:0;marker-end:url(#Arrow2Lend)"
- d="M 280,512.66591 L 132.85714,241.23734"
- id="path3648" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3650"
- transform="matrix(0.764739,0,0,0.753419,301.1926,-32.06018)"><flowRegion
- id="flowRegion3652"><rect
- id="rect3654"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3656">Target</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot3658"
- transform="matrix(0.764739,0,0,0.753419,1.177328,346.747)"><flowRegion
- id="flowRegion3660"><rect
- id="rect3662"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3664">Source</flowPara></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
- d="M 480.83261,205.68318 L 517.1981,205.68318 L 518.20826,511.7594 L 546.49253,511.7594"
- id="path3670" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3672"
- transform="translate(281.8571,183.8295)"><flowRegion
- id="flowRegion3674"><rect
- id="rect3676"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara3678">InnerComposite2</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot2048"
- transform="matrix(0.768159,0,0,0.869201,-73.32453,313.1674)"><flowRegion
- id="flowRegion2050"><rect
- id="rect2052"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2054">promote</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot2056"
- transform="matrix(0.768159,0,0,0.869201,397.4066,306.0963)"><flowRegion
- id="flowRegion2058"><rect
- id="rect2060"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2062">promote</flowPara></flowRoot> </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/implementation-composite/pom.xml b/branches/sca-java-0.99/samples/implementation-composite/pom.xml
deleted file mode 100644
index 8b041e3ed2..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-implementation-composite</artifactId>
- <name>Apache Tuscany Composite Implementation Sample</name>
- <description>A sample showing local wiring of a component implemented by a nested composite</description>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/CompositeClient.java
deleted file mode 100644
index bf743e1797..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package composite;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Simple client program that invokes the components that we wired together.
- */
-public class CompositeClient {
-
- public static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance();
-
- Source source = scaDomain.getService(Source.class, "SourceComponent");
-
- System.out.println("Main thread " + Thread.currentThread());
- source.clientMethod("Client.main");
- System.out.println("Sleeping ...");
- Thread.sleep(1000);
-
- scaDomain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Source.java b/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Source.java
deleted file mode 100644
index d0efcc1df1..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Source.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package composite;
-
-public interface Source {
-
- void clientMethod(String arg);
-}
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceCallback.java
deleted file mode 100644
index baa95a8e39..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package composite;
-
-public interface SourceCallback {
-
- void receiveResult(String result);
-}
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceImpl.java
deleted file mode 100644
index b9a0c7ff74..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/SourceImpl.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 composite;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-@Service(Source.class)
-@Scope("COMPOSITE")
-public class SourceImpl implements Source, SourceCallback {
-
- private Target targetReference;
- private Target targetReference2;
-
- @Reference
- public void setTargetReference(Target target) {
- this.targetReference = target;
- }
-
- @Reference
- public void setTargetReference2(Target target) {
- this.targetReference2 = target;
- }
-
- public void clientMethod(String arg) {
- System.out.println("Source: " + arg + " -> Source.clientMethod");
- targetReference.someMethod(arg + " -> Source.clientMethod");
-
- System.out.println("Source: " + arg + " => Source.clientMethod2");
- targetReference2.someMethod(arg + " => Source.clientMethod2");
- }
-
- public void receiveResult(String result) {
- System.out.println("Work thread " + Thread.currentThread());
- System.out.println("Result: " + result);
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Target.java b/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Target.java
deleted file mode 100644
index 9a8f68a7fa..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/Target.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 composite;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-
-
-@Callback(SourceCallback.class)
-public interface Target {
-
- @OneWay
- void someMethod(String arg);
-}
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/TargetImpl.java
deleted file mode 100644
index 86686e9233..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package composite;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-@Service(Target.class)
-@Scope("COMPOSITE")
-public class TargetImpl implements Target {
-
- private SourceCallback sourceCallback;
-
- @Callback
- public void setSourceCallback(SourceCallback sourceCallback) {
- this.sourceCallback = sourceCallback;
- }
-
- public void someMethod(String arg) {
- System.out.println("Target: " + arg);
- sourceCallback.receiveResult(arg + " -> Target.someMethod");
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite.composite b/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite.composite
deleted file mode 100644
index 3376ac8ff5..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="InnerComposite">
-
- <service name="InnerSourceService" promote="InnerSourceComponent">
- <interface.java interface="composite.Source"/>
- </service>
-
- <component name="InnerSourceComponent">
- <implementation.java class="composite.SourceImpl"/>
- </component>
-
- <reference name="targetComponentRef" promote="InnerSourceComponent/targetReference">
- <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
- </reference>
-
- <reference name="targetComponentRef2" promote="InnerSourceComponent/targetReference2">
- <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite2.composite
deleted file mode 100644
index c9eff4fa9d..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="InnerComposite2">
-
- <service name="InnerTargetService" promote="InnerTargetComponent">
- <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
- </service>
-
- <component name="InnerTargetComponent">
- <implementation.java class="composite.TargetImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e675fd3624..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:OuterComposite"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/OuterComposite.composite b/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/OuterComposite.composite
deleted file mode 100644
index cb1c1e13d4..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="OuterComposite">
-
- <component name="SourceComponent">
- <implementation.composite name="sample:InnerComposite"/>
- <reference name="targetComponentRef" target="TargetComponent"/>
- <reference name="targetComponentRef2" target="TargetComponent2/InnerTargetService"/>
- </component>
-
- <component name="TargetComponent">
- <implementation.java class="composite.TargetImpl"/>
- </component>
-
- <component name="TargetComponent2">
- <implementation.composite name="sample:InnerComposite2"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/branches/sca-java-0.99/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
deleted file mode 100644
index 9e9a4b44a4..0000000000
--- a/branches/sca-java-0.99/samples/implementation-composite/src/test/java/composite/CompositeTestCase.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 composite;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CompositeTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private Source source;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance();
- source = scaDomain.getService(Source.class, "SourceComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void test() throws Exception {
- try {
- System.out.println("Main thread " + Thread.currentThread());
- source.clientMethod("Client.main");
- System.out.println("Sleeping ...");
- Thread.sleep(1000);
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/README b/branches/sca-java-0.99/samples/implementation-crud-extension/README
deleted file mode 100644
index 5e8190648f..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/README
+++ /dev/null
@@ -1,83 +0,0 @@
-Implementation CRUD Sample
-==========================
-This sample demonstrates how new implementation types are constructed for
-Apache Tuscany SCA.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you want to try out the CRUD implementation type that this sample provides
-please see the implementation-crud sample that provides the necessary client
-code to bring up an application that uses this implementation extension.
-
-Sample Overview
----------------
-This sample contains a CRUD implementation type as an example of how to create
-new implementation types. Components using this implementation type always
-expose the same Create, Retrieve, Update and Delete interface. This sample
-uses a singleton ResourceManager to perform the CRUD operations but of course
-a real component would provide a real implementation.
-
-implementation-crud-extension/
- src/
- main/
- java/
- crud/ - implementation model interfaces
- backend/ - fake component implementation
- impl/ - implementations of the model interfaces
- provider/ - runtime implementation
- resources/
- META-INF/
- services/ - declares the extension
- test/
- java/
- crud/
- CRUDTestCase.java - JUnit test case
- resources/
- crud.composite - the SCA assembly used during unit testing
-
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building The Sample Extension Using Ant
------------------------------------------
-With the binary distribution the sample extension can be built using Ant as
-follows
-
-cd implementation-crud-extension
-ant compile
-
-See the implementation-crud sample to run a sample that uses this
-implementation extension.
-
-Building The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built
-using Maven as follows.
-
-cd implementation-crud-extension
-mvn
-
-Maven will also test that the sample extension built properly. You should see
-the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running crud.CRUDTestCase
-Starting CRUDServiceComponent
-create(ABC) in tmp
-retrieve(0)
-update(0)
-retrieve(0)
-delete(0)
-retrieve(0)
-Stopping CRUDServiceComponent
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.212 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/build.xml b/branches/sca-java-0.99/samples/implementation-crud-extension/build.xml
deleted file mode 100644
index 88d308e6fc..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/build.xml
+++ /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.
--->
-<project name="implementation-crud-extension" default="compile">
- <property name="test.jar" value="sample-implementation-crud-extension.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/pom.xml b/branches/sca-java-0.99/samples/implementation-crud-extension/pom.xml
deleted file mode 100644
index bd126c8f27..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-implementation-crud-extension</artifactId>
- <name>Apache Tuscany CRUD Implementation Extension Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-java-xml</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
deleted file mode 100644
index b23d85887b..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUD.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 crud;
-
-/**
- * The service interface of the single CRUD service provided by CRUD components.
- */
-public interface CRUD {
-
- /**
- * Create a new resource.
- * @param resource
- * @return
- */
- String create(Object resource);
-
- /**
- * Retrieve a resource.
- * @param id
- * @return
- */
- Object retrieve(String id);
-
- /**
- * Update a resource.
- * @param id
- * @param resource
- * @return
- */
- Object update(String id, Object resource);
-
- /**
- * Delete a resource.
- * @param id
- */
- void delete(String id);
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
deleted file mode 100644
index 5cb2bd2b1c..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.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 crud;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-/**
- * The model representing a sample CRUD implementation in an SCA assembly model.
- * The sample CRUD implementation is not a full blown implementation, it only
- * supports a subset of what a component implementation can support: - a single
- * fixed service (as opposed to a list of services typed by different
- * interfaces) - a directory attribute used to specify where a CRUD component is
- * going to persist resources - no references or properties - no policy intents
- * or policy sets
- */
-public interface CRUDImplementation extends Implementation {
-
- /**
- * Returns the directory used by CRUD implementations to persist resources.
- *
- * @return the directory used to persist resources
- */
- public String getDirectory();
-
- /**
- * Sets the directory used by CRUD implementations to persist resources.
- *
- * @param directory the directory used to persist resources
- */
- public void setDirectory(String directory);
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
deleted file mode 100644
index fa83c63c1b..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.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 crud;
-
-import crud.CRUDImplementation;
-
-
-/**
- * A factory for the sample CRUD implementation model.
- */
-public interface CRUDImplementationFactory {
-
- /**
- * Creates a new CRUD implementation.
- *
- * @return
- */
- CRUDImplementation createCRUDImplementation();
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
deleted file mode 100644
index cc0795a735..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package crud.backend;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A fake resource manager implementation used as a backend by the sample
- * CRUD component implementation.
- */
-public class ResourceManager {
- private static int counter;
- private static final Map<String, Object> store = new HashMap<String, Object>();
- private String directory;
-
- /**
- * Constructs a new resource manager.
- *
- * @param directory the directory where to persist resources
- */
- public ResourceManager(String directory) {
- super();
- this.directory = directory;
- }
-
- /**
- * Creates a new resource.
- *
- * @param resource
- * @return
- */
- public String createResource(Object resource) {
- System.out.println("create(" + resource + ") in " + directory);
- String key = String.valueOf(counter++);
- store.put(key, resource);
- return key;
- }
-
- /**
- * Deletes a resource.
- *
- * @param id
- */
- public void deleteResource(String id) {
- System.out.println("delete(" + id + ")");
- store.remove(id);
- }
-
- /**
- * Retrieves a resource.
- *
- * @param id
- * @return
- */
- public Object retrieveResource(String id) {
- System.out.println("retrieve(" + id + ")");
- return store.get(id);
- }
-
- /**
- * Updates a resource.
- *
- * @param id
- * @param resource
- * @return
- */
- public Object updateResource(String id, Object resource) {
- System.out.println("update(" + id + ")");
- return store.put(id, resource);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
deleted file mode 100644
index 7f9f8da674..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.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 crud.impl;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-import crud.CRUDImplementation;
-import crud.CRUDImplementationFactory;
-
-
-/**
- * A default factory for the CRUD implementation model.
- */
-public class CRUDImplementationFactoryImpl implements CRUDImplementationFactory {
-
- private AssemblyFactory assemblyFactory;
- private JavaInterfaceFactory javaFactory;
-
- public CRUDImplementationFactoryImpl(ModelFactoryExtensionPoint modelFactories) {
- this.assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
- this.javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
- }
-
- public CRUDImplementation createCRUDImplementation() {
- return new CRUDImplementationImpl(assemblyFactory, javaFactory);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
deleted file mode 100644
index 383a035e69..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.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 crud.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-import crud.CRUD;
-import crud.CRUDImplementation;
-
-
-/**
- * The model representing a sample CRUD implementation in an SCA assembly model.
- */
-class CRUDImplementationImpl implements CRUDImplementation {
-
- private Service crudService;
- private String directory;
-
- /**
- * Constructs a new CRUD implementation.
- */
- CRUDImplementationImpl(AssemblyFactory assemblyFactory,
- JavaInterfaceFactory javaFactory) {
-
- // CRUD implementation always provide a single service exposing
- // the CRUD interface, and have no references and properties
- crudService = assemblyFactory.createService();
- crudService.setName("CRUD");
- JavaInterface javaInterface;
- try {
- javaInterface = javaFactory.createJavaInterface(CRUD.class);
- } catch (InvalidInterfaceException e) {
- throw new IllegalArgumentException(e);
- }
- JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
- interfaceContract.setInterface(javaInterface);
- crudService.setInterfaceContract(interfaceContract);
- }
-
- public String getDirectory() {
- return directory;
- }
-
- public void setDirectory(String directory) {
- this.directory = directory;
- }
-
- public ConstrainingType getConstrainingType() {
- // The sample CRUD implementation does not support constrainingTypes
- return null;
- }
-
- public List<Property> getProperties() {
- // The sample CRUD implementation does not support properties
- return Collections.emptyList();
- }
-
- public List<Service> getServices() {
- // The sample CRUD implementation provides a single fixed CRUD service
- return Collections.singletonList(crudService);
- }
-
- public List<Reference> getReferences() {
- // The sample CRUD implementation does not support properties
- return Collections.emptyList();
- }
-
- public String getURI() {
- // The sample CRUD implementation does not have a URI
- return null;
- }
-
- public void setConstrainingType(ConstrainingType constrainingType) {
- // The sample CRUD implementation does not support constrainingTypes
- }
-
- public void setURI(String uri) {
- // The sample CRUD implementation does not have a URI
- }
-
- public boolean isUnresolved() {
- // The sample CRUD implementation is always resolved
- return false;
- }
-
- public void setUnresolved(boolean unresolved) {
- // The sample CRUD implementation is always resolved
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
deleted file mode 100644
index f37d9f0c1d..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package crud.provider;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-import crud.backend.ResourceManager;
-
-
-/**
- * Implements a target invoker for CRUD component implementations.
- *
- * The target invoker is responsible for dispatching invocations to the particular
- * component implementation logic. In this example we are simply delegating the
- * CRUD operation invocations to the corresponding methods on our fake
- * resource manager.
- */
-class CRUDImplementationInvoker implements Invoker {
- private Operation operation;
- private ResourceManager resourceManager;
-
- CRUDImplementationInvoker(Operation operation, ResourceManager resourceManager) {
- this.operation = operation;
- this.resourceManager = resourceManager;
- }
-
- public Message invoke(Message msg) {
- try {
- Object[] args = msg.getBody();
- Object resp = null;
-
- if (operation.getName().equals("create")) {
- resp = resourceManager.createResource(args[0]);
-
- } else if (operation.getName().equals("retrieve")) {
- resp = resourceManager.retrieveResource((String)args[0]);
-
- } else if (operation.getName().equals("update")) {
- resp = resourceManager.updateResource((String)args[0], args[1]);
-
- } else if (operation.getName().equals("delete")) {
- resourceManager.deleteResource((String)args[0]);
- }
-
- msg.setBody(resp);
- } catch (Exception e) {
- msg.setFaultBody(e.getCause());
- }
- return msg;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
deleted file mode 100644
index 93930d5dfe..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package crud.provider;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-import crud.CRUDImplementation;
-import crud.backend.ResourceManager;
-
-
-/**
- * The model representing a sample CRUD implementation in an SCA assembly model.
- * The sample CRUD implementation is not a full blown implementation, it only
- * supports a subset of what a component implementation can support: - a single
- * fixed service (as opposed to a list of services typed by different
- * interfaces) - a directory attribute used to specify where a CRUD component is
- * going to persist resources - no references or properties - no policy intents
- * or policy sets
- */
-class CRUDImplementationProvider implements ImplementationProvider {
-
- private RuntimeComponent component;
- private CRUDImplementation implementation;
-
- /**
- * Constructs a new CRUD implementation.
- */
- CRUDImplementationProvider(RuntimeComponent component, CRUDImplementation implementation) {
- this.component = component;
- this.implementation = implementation;
- }
-
- public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
- CRUDImplementationInvoker invoker = new CRUDImplementationInvoker(operation, new ResourceManager(implementation.getDirectory()));
- return invoker;
- }
-
- public Invoker createCallbackInvoker(Operation operation) {
- CRUDImplementationInvoker invoker = new CRUDImplementationInvoker(operation, new ResourceManager(implementation.getDirectory()));
- return invoker;
- }
-
- public void start() {
- System.out.println("Starting " + component.getName());
- }
-
- public void stop() {
- System.out.println("Stopping " + component.getName());
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
deleted file mode 100644
index d0166d649b..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.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 crud.provider;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-import crud.CRUDImplementation;
-import crud.provider.CRUDImplementationProvider;
-
-
-/**
- * The model representing a sample CRUD implementation in an SCA assembly model.
- * The sample CRUD implementation is not a full blown implementation, it only
- * supports a subset of what a component implementation can support: - a single
- * fixed service (as opposed to a list of services typed by different
- * interfaces) - a directory attribute used to specify where a CRUD component is
- * going to persist resources - no references or properties - no policy intents
- * or policy sets
- */
-public class CRUDImplementationProviderFactory implements ImplementationProviderFactory<CRUDImplementation> {
-
- /**
- * Constructs a new CRUD implementation.
- */
- public CRUDImplementationProviderFactory(ExtensionPointRegistry extensionPoints) {
- }
-
- public ImplementationProvider createImplementationProvider(RuntimeComponent component, CRUDImplementation implementation) {
- return new CRUDImplementationProvider(component, implementation);
- }
-
- public Class<CRUDImplementation> getModelType() {
- return CRUDImplementation.class;
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
deleted file mode 100644
index 3cf5de5fa1..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the implementation model factory
-crud.impl.CRUDImplementationFactoryImpl
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 17c98cf706..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://crud#implementation.crud,model=crud.CRUDImplementation,factory=crud.CRUDImplementationFactory
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 6ce605197a..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the implementation extension
-crud.provider.CRUDImplementationProviderFactory;model=crud.CRUDImplementation
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
deleted file mode 100644
index 999ec4bdb6..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.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 crud;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import crud.CRUD;
-
-/**
- * Tests the CRUD service
- */
-public class CRUDTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private CRUD crudService;
-
- /**
- * @throws java.lang.Exception
- */
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("crud.composite");
- crudService = scaDomain.getService(CRUD.class, "CRUDServiceComponent");
- }
-
- /**
- * @throws java.lang.Exception
- */
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
-
- public void testCRUD() throws Exception {
- String id = crudService.create("ABC");
- Object result = crudService.retrieve(id);
- assertEquals("ABC", result);
- crudService.update(id, "EFG");
- result = crudService.retrieve(id);
- assertEquals("EFG", result);
- crudService.delete(id);
- result = crudService.retrieve(id);
- assertNull(result);
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/resources/crud.composite b/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/resources/crud.composite
deleted file mode 100644
index 18745033bb..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample/crud"
- xmlns:sc="http://sample/crud"
- xmlns:c="http://crud"
- name="crud">
-
- <component name="CRUDServiceComponent">
- <c:implementation.crud directory="tmp" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/implementation-crud/README b/branches/sca-java-0.99/samples/implementation-crud/README
deleted file mode 100644
index 50da631c04..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud/README
+++ /dev/null
@@ -1,113 +0,0 @@
-Implementation CRUD Sample Client
-=================================
-This sample demonstrates how to use the new implementation extension,
-implementation-crud-extension.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens, open a command prompt,
-navigate to this sample directory, and do
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;..\implementation-crud-extension\target\sample-implementation-crud-extension.jar;target\sample-implementation-crud.jar crud.client.CRUDClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:../implementation-crud-extension/target/sample-implementation-crud-extension.jar:target/sample-implementation-crud.jar crud.client.CRUDClient
-
-This looks like a long command. The three things we add to the classpath are
-
-tuscany-sca-manifest.jar - all of the standard Tuscany SCA
- runtime and extension classes
-sample-implementation-crud-extension.jar - the new crud implementation
- extension
-sample-implementation-crud.jar - the application that uses the crud
- implementation
-
-Sample Overview
----------------
-This sample contains a client application for a CRUD implementation type that
-shows how to create new implementation types. See the README for the
-mplementation-crud-extension sample for details of this implementation type.
-
-implementation-crud/
- src/
- main/
- java/
- crud/
- client/
- CRUDClient.java - sample client
- resources/
- crud.composite - the SCA assembly used by this sample
-
- test/
- java/
- crud/
- client/
- CRUDTestCase.java - sample JUnit test case for the sample client
-
- implementation-crud.png - a pictorial representation of the sample
- .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd implementation-crud
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Starting CRUDServiceComponent
- [java] create(ABC) in tmp
- [java] retrieve(0)
- [java] Result from create: ABC
- [java] update(0)
- [java] retrieve(0)
- [java] Result from update: EFG
- [java] delete(0)
- [java] retrieve(0)
- [java] Result from delete: null
- [java] Stopping CRUDServiceComponent
-
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and
-run using Maven as follows.
-
-cd implementation-crud
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running crud.client.CRUDTestCase
-Starting CRUDServiceComponent
-create(ABC) in tmp
-retrieve(0)
-update(0)
-retrieve(0)
-delete(0)
-retrieve(0)
-Stopping CRUDServiceComponent
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.641 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/implementation-crud/build.xml b/branches/sca-java-0.99/samples/implementation-crud/build.xml
deleted file mode 100644
index 10b26b5a94..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud/build.xml
+++ /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.
--->
-<project name="implementation-crud" default="compile">
- <property name="test.class" value="crud.client.CRUDClient" />
- <property name="test.jar" value="sample-implementation-crud.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../implementation-crud-extension/target/sample-implementation-crud-extension.jar"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../implementation-crud-extension/target/sample-implementation-crud-extension.jar"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement location="target/${test.jar}"/>
- <pathelement location="../implementation-crud-extension/target/sample-implementation-crud-extension.jar"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.png b/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.png
deleted file mode 100644
index a292037e7a..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.svg b/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.svg
deleted file mode 100644
index dbb37be208..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud/implementation-crud.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\implementation-crud"
- sodipodi:docname="implementation-crud.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\implementation-crud\implementation-crud.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="528.85714"
- inkscape:cy="406.01174"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1142"
- inkscape:window-height="722"
- inkscape:window-x="107"
- inkscape:window-y="128" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(1.038749,0,0,1.009461,-29.25616,-1.807024)">
- <rect
- rx="8.7034655"
- ry="12.692303"
- y="192.00233"
- x="375.89822"
- height="299.99988"
- width="281.85843"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.95312572;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"
- transform="translate(104.5213,-10.61387)"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">crud</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="450.63062"
- y="302.8819"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(183.0398,96.94336)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">CRUDService</flowPara><flowPara
- id="flowPara1894">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 433.4801,334.72889 L 466.81514,334.72889 L 472.87605,347.86087 L 465.80499,359.98271 L 433.4801,359.98271 L 441.05625,347.86087 L 433.4801,334.72889 z "
- id="path3017" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1904"
- transform="translate(158.2681,129.761)"><flowRegion
- id="flowRegion1906"><rect
- id="rect1908"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1912"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans">CRUD</flowPara></flowRoot> </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/implementation-crud/pom.xml b/branches/sca-java-0.99/samples/implementation-crud/pom.xml
deleted file mode 100644
index c27996539e..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-implementation-crud</artifactId>
- <name>Apache Tuscany CRUD Implementation Extension Sample Client</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sample-implementation-crud-extension</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/branches/sca-java-0.99/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
deleted file mode 100644
index e349f30fb9..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud/src/main/java/crud/client/CRUDClient.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 crud.client;
-
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import crud.CRUD;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CRUDClient {
-
- public static void main(String[] args) throws Exception {
-
- SCADomain scaDomain = SCADomain.newInstance("crud.composite");
- CRUD crudService = scaDomain.getService(CRUD.class, "CRUDServiceComponent");
-
- String id = crudService.create("ABC");
- Object result = crudService.retrieve(id);
- System.out.println("Result from create: " + result);
- crudService.update(id, "EFG");
- result = crudService.retrieve(id);
- System.out.println("Result from update: " + result);
- crudService.delete(id);
- result = crudService.retrieve(id);
- if (result == null) {
- System.out.println("Result from delete: null");
- } else {
- System.out.println("Result from delete: should be null but was " + result);
- }
-
- scaDomain.close();
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-crud/src/main/resources/crud.composite b/branches/sca-java-0.99/samples/implementation-crud/src/main/resources/crud.composite
deleted file mode 100644
index 18745033bb..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud/src/main/resources/crud.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample/crud"
- xmlns:sc="http://sample/crud"
- xmlns:c="http://crud"
- name="crud">
-
- <component name="CRUDServiceComponent">
- <c:implementation.crud directory="tmp" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/branches/sca-java-0.99/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
deleted file mode 100644
index 171ddbaed3..0000000000
--- a/branches/sca-java-0.99/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.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 crud.client;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import crud.CRUD;
-
-
-public class CRUDTestCase extends TestCase {
-
- private SCADomain scaDomain;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("crud.composite");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void test() throws Exception {
- CRUD crudService = scaDomain.getService(CRUD.class, "CRUDServiceComponent");
-
- String id = crudService.create("ABC");
- Object result = crudService.retrieve(id);
- assertEquals(result, "ABC");
-
- crudService.update(id, "EFG");
- result = crudService.retrieve(id);
- assertEquals(result, "EFG");
-
- crudService.delete(id);
- result = crudService.retrieve(id);
- assertNull(result);
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-notification/README b/branches/sca-java-0.99/samples/implementation-notification/README
deleted file mode 100644
index 9a3e74a3a2..0000000000
--- a/branches/sca-java-0.99/samples/implementation-notification/README
+++ /dev/null
@@ -1,70 +0,0 @@
-Notification Implementation Sample
-===============================
-
-This sample illustrates the use of <implementation.notification/>
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-mvn test
-
-Sample Overview
----------------
-
-This sample consists of a single composite that contains a notification component,
-a producer component and two consumer components. Take a look at the composite file
-or the .svg file which shows the composite file in pictorial form. The notification
-component has an <implementation.notification/> that refers to the component type
-that defines the TrafficAdvisory java interface. This interface indicates the
-makeup of the messages being sent and received and is also implemented by the
-consumer components.
-
-Sample directory structure:
-
-implementation-notification/
- src/
- main/
- java/
- notification/
- TestCaseProducer.java - interface for the producer component
- TrafficAdvisory.java - interface for the notification and consumer components
- TrafficAdvisoryConsumer.java - implementation for the consumer components
- TrafficAdvisoryProducer.java - implementation for the producer component
- test/
- java/
- notification/
- TrafficAdvisoryTestCase.java - JUnit test case
- resources/
- TrafficAdvisoryNotification.componentType - the component type referred to by
- <implementation.notification/>
- TrafficAdvisoryNotification.composite - the main composite including producer,
- notification component, and consumers
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd implementation-notification
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running notification.TrafficAdvisoryTestCase
-Consumer [Consumer1] received report: Nothing to report today
-Consumer [Consumer2] received report: Nothing to report today
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.742 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/implementation-notification/implementation-notification.png b/branches/sca-java-0.99/samples/implementation-notification/implementation-notification.png
deleted file mode 100644
index 0b7ee34bf7..0000000000
--- a/branches/sca-java-0.99/samples/implementation-notification/implementation-notification.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/implementation-notification/pom.xml b/branches/sca-java-0.99/samples/implementation-notification/pom.xml
deleted file mode 100644
index 7ac4866728..0000000000
--- a/branches/sca-java-0.99/samples/implementation-notification/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-implementation-notification</artifactId>
- <name>Apache Tuscany Notification Implementation Sample</name>
- <version>0.99-incubating-SNAPSHOT</version>
- <description>A sample illustrating use of implementation.notification</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-notification</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
- <!-- if this is not in, BuilderRegistryImpl throws NPE (line 96) -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <!-- end -->
-
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- <defaultGoal>install</defaultGoal>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
deleted file mode 100644
index bf8c72e0ce..0000000000
--- a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package notification;
-
-public interface TestCaseProducer {
-
- public void produceTrafficNotification(String report);
-}
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
deleted file mode 100644
index 7bbfda2122..0000000000
--- a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package notification;
-
-public interface TrafficAdvisory {
-
- void trafficNotification(String report);
-}
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
deleted file mode 100644
index 2aaae596be..0000000000
--- a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package notification;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(TrafficAdvisory.class)
-@Scope("COMPOSITE")
-public class TrafficAdvisoryConsumer implements TrafficAdvisory {
-
- @Property
- protected String name;
-
- public void trafficNotification(String report) {
-
- System.out.println("Consumer [" + name + "] received report: " + report);
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
deleted file mode 100644
index a0bb02e846..0000000000
--- a/branches/sca-java-0.99/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.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 notification;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(TestCaseProducer.class)
-@Scope("COMPOSITE")
-public class TrafficAdvisoryProducer implements TestCaseProducer {
-
- @Reference
- protected TrafficAdvisory destination;
-
- public void produceTrafficNotification(String report) {
-
- destination.trafficNotification(report);
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/branches/sca-java-0.99/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
deleted file mode 100644
index 719141c94b..0000000000
--- a/branches/sca-java-0.99/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package notification;
-
-import junit.framework.TestCase;
-
-import notification.TestCaseProducer;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class TrafficAdvisoryTestCase extends TestCase {
-
- private SCADomain domain;
- private TestCaseProducer testCaseProducer;
-
- public void testTrafficAdvisoryNotification() throws Exception {
- try {
- testCaseProducer.produceTrafficNotification("Nothing to report today");
- } catch(Throwable e) {
- e.printStackTrace();
- }
- }
-
- @Override
- protected void setUp() throws Exception {
- try {
- domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
- testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
- } catch(Throwable e) {
- e.printStackTrace();
- if (e instanceof Exception) {
- throw (Exception)e;
- }
- else {
- throw new Exception(e);
- }
- }
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 873e200613..0000000000
--- a/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <service name="TrafficAdvisoryNotificationService">
- <interface.java interface="notification.TrafficAdvisory"/>
- </service>
-
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n">
- <interface.java interface="notification.TrafficAdvisory"/>
- </reference>
-</componentType>
diff --git a/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index bbf2281352..0000000000
--- a/branches/sca-java-0.99/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="TrafficAdvisoryNotificationLocalComposite">
-
- <component name="TrafficAdvisoryProducer">
- <implementation.java class="notification.TrafficAdvisoryProducer"/>
- <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>
- </component>
-
- <component name="TrafficAdvisoryNotificationComponent">
- <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>
- <!-- Never use > 1 reference elements here !! -->
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n"
- target="TrafficAdvisoryConsumer1 TrafficAdvisoryConsumer2"/>
- </component>
-
- <component name="TrafficAdvisoryConsumer1">
- <implementation.java class="notification.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer1</property>
- </component>
-
- <component name="TrafficAdvisoryConsumer2">
- <implementation.java class="notification.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer2</property>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/README b/branches/sca-java-0.99/samples/implementation-pojo-extension/README
deleted file mode 100644
index 3b201779e1..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/README
+++ /dev/null
@@ -1,70 +0,0 @@
-Implementation POJO Sample
-==========================
-This sample demonstrates how new implementation types are constructed for
-Apache Tuscany SCA.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-Sample Overview
----------------
-This sample contains a POJO implementation type as an example of how to create
-new implementation types.
-
-implementation-pojo-extension/
- src/
- main/
- java/
- pojo/ - implementation model interfaces
- impl/ - implementations of the model interfaces
- provider/ - runtime implementation
- resources/
- META-INF/
- services/ - declares the extension
- test/
- java/
- helloworld/
- HelloWorldTestCase.java - JUnit test case
- resources/
- helloworld.composite - the SCA assembly used during unit testing
-
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building The Sample Extension Using Ant
------------------------------------------
-With the binary distribution the sample extension can be built using Ant as
-follows
-
-cd implementation-pojo-extension
-ant compile
-
-Building The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built
-using Maven as follows.
-
-cd implementation-pojo-extension
-mvn
-
-Maven will also test that the sample extension built properly. You should see
-the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldTestCase
-Initializing POJO
-Initializing POJO
-Executing POJO sayHello
-Initializing POJO
-Initializing POJO
-Executing POJO sayHello
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.616 sec
-
-Results :
-
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/build.xml b/branches/sca-java-0.99/samples/implementation-pojo-extension/build.xml
deleted file mode 100644
index 78bae79859..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/build.xml
+++ /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.
--->
-<project name="implementation-pojo-extension" default="compile">
- <property name="test.jar" value="sample-implementation-pojo-extension.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/pom.xml b/branches/sca-java-0.99/samples/implementation-pojo-extension/pom.xml
deleted file mode 100644
index 18482be6e6..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-implementation-pojo-extension</artifactId>
- <name>Apache Tuscany Java Implementation Extension Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-java</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
deleted file mode 100644
index 7c2f5d236f..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package pojo;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.Implementation;
-
-
-/**
- * Represents a POJO implementation in an SCA assembly.
- *
- * @version $Rev$ $Date$
- */
-public interface POJOImplementation extends Implementation {
-
- /**
- * Returns the POJO class name
- * @return
- */
- public String getPOJOName();
-
- /**
- * Sets the POJO class name
- * @param pojoName
- */
- public void setPOJOName(String pojoName);
-
- /**
- * Returns the POJO class.
- * @return
- */
- public Class<?> getPOJOClass();
-
- /**
- * Sets the POJO class.
- * @param pojoClass
- */
- public void setPOJOClass(Class<?> pojoClass);
-
- /**
- * Returns the POJO's methods.
- * @return
- */
- public Map<String, Method> getMethods();
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
deleted file mode 100644
index bbcfb3d0dc..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.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 pojo;
-
-
-/**
- * Factory for the POJO implementation model.
- *
- * @version $Rev$ $Date$
- */
-public interface POJOImplementationFactory {
-
- /**
- * Creates a new POJO implementation model object.
- * @return a new POJO implementation model object
- */
- POJOImplementation createPOJOImplementation();
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
deleted file mode 100644
index 0dad270a6c..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.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 pojo.impl;
-
-import pojo.POJOImplementation;
-import pojo.POJOImplementationFactory;
-
-/**
- * A factory for the POJO implementation model.
- *
- * @version $Rev$ $Date$
- */
-public class POJOImplementationFactoryImpl implements POJOImplementationFactory {
-
- public POJOImplementation createPOJOImplementation() {
- return new POJOImplementationImpl();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
deleted file mode 100644
index b5682673f6..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package pojo.impl;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-
-import pojo.POJOImplementation;
-
-
-/**
- * Represents a POJO implementation in an SCA assembly.
- *
- * @version $Rev$ $Date$
- */
-class POJOImplementationImpl implements POJOImplementation {
-
- private String pojoName;
- private Class<?> pojoClass;
- private String uri;
- private Map<String, Method> methods;
- private List<Service> services = new ArrayList<Service>();
- private List<Reference> references = new ArrayList<Reference>();
- private List<Property> properties = new ArrayList<Property>();
- private boolean unresolved;
-
- POJOImplementationImpl() {
- }
-
- /**
- * Returns the POJO class name
- * @return
- */
- public String getPOJOName() {
- return pojoName;
- }
-
- /**
- * Sets the POJO class name
- * @param pojoName
- */
- public void setPOJOName(String pojoName) {
- this.pojoName = pojoName;
- setURI(pojoName.replace('.', '/'));
- }
-
- /**
- * Returns the POJO class.
- * @return
- */
- public Class<?> getPOJOClass() {
- return pojoClass;
- }
-
- /**
- * Sets the POJO class.
- * @param pojoClass
- */
- public void setPOJOClass(Class<?> pojoClass) {
- this.pojoClass = pojoClass;
- setPOJOName(pojoClass.getName());
-
- // Index the POJO's methods
- methods = new HashMap<String, Method>();
- Method[] m = pojoClass.getMethods();
- for (int i = 0; i < m.length; i++) {
- methods.put(m[i].getName(), m[i]);
- }
- }
-
- /**
- * Returns the POJO's methods.
- * @return
- */
- public Map<String, Method> getMethods() {
- return methods;
- }
-
- public ConstrainingType getConstrainingType() {
- // The sample POJO implementation does not support constrainingTypes
- return null;
- }
-
- public List<Property> getProperties() {
- return properties;
- }
-
- public List<Service> getServices() {
- return services;
- }
-
- public List<Reference> getReferences() {
- return references;
- }
-
- public String getURI() {
- return uri;
- }
-
- public void setConstrainingType(ConstrainingType constrainingType) {
- // The sample POJO implementation does not support constrainingTypes
- }
-
- public void setURI(String uri) {
- this.uri = uri;
- }
-
- public boolean isUnresolved() {
- return unresolved;
- }
-
- public void setUnresolved(boolean unresolved) {
- this.unresolved = unresolved;
- }
-
- @Override
- public int hashCode() {
- return uri.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof POJOImplementationImpl) {
- return ((POJOImplementationImpl)obj).getURI().equals(uri);
- } else {
- return false;
- }
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
deleted file mode 100644
index 51480d5de5..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package pojo.impl;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-import pojo.POJOImplementation;
-import pojo.POJOImplementationFactory;
-
-/**
- * Implements a STAX based artifact processor for POJO implementations.
- *
- * The artifact processor is responsible for processing <implementation.pojo>
- * elements in SCA assembly XML composite files and populating the POJO
- * implementation model, resolving its references to other artifacts in the SCA
- * contribution, and optionally write the model back to SCA assembly XML.
- */
-public class POJOImplementationProcessor implements StAXArtifactProcessor<POJOImplementation> {
- private static final QName IMPLEMENTATION_POJO = new QName("http://pojo", "implementation.pojo");
-
- private AssemblyFactory assemblyFactory;
- private JavaInterfaceFactory javaFactory;
- private POJOImplementationFactory pojoImplementationFactory;
-
- public POJOImplementationProcessor(ModelFactoryExtensionPoint modelFactories) {
-
- // Get the assembly and Java interface factories as we'll need them to
- // create model objects
- assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
- javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
- pojoImplementationFactory = modelFactories.getFactory(POJOImplementationFactory.class);
- }
-
- public QName getArtifactType() {
- // Returns the qname of the XML element processed by this processor
- return IMPLEMENTATION_POJO;
- }
-
- public Class<POJOImplementation> getModelType() {
- // Returns the type of model processed by this processor
- return POJOImplementation.class;
- }
-
- public POJOImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
- // Read an <implementation.pojo> element
-
- // Read the POJO class attribute.
- String className = reader.getAttributeValue(null, "class");
-
- // Create the POJO implementation model
- POJOImplementation implementation = pojoImplementationFactory.createPOJOImplementation();
- implementation.setPOJOName(className);
-
- // Mark the POJO model unresolved to track the fact that it's not
- // completely initialized, its class is not loaded yet and services
- // and references not initialized either
- implementation.setUnresolved(true);
-
- // Skip to end element
- while (reader.hasNext()) {
- if (reader.next() == END_ELEMENT && IMPLEMENTATION_POJO.equals(reader.getName())) {
- break;
- }
- }
-
- return implementation;
- }
-
- public void resolve(POJOImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
-
- // Resolve the POJO implementation
-
- // First resolve its class
- ClassReference classReference = new ClassReference(implementation.getPOJOName());
- classReference = resolver.resolveModel(ClassReference.class, classReference);
- Class pojoClass = classReference.getJavaClass();
- if (pojoClass == null) {
- throw new ContributionResolveException("Class could not be resolved: " + implementation.getPOJOName());
- }
- implementation.setPOJOClass(pojoClass);
-
- // Check to see if we have a .componentType file describing the POJO class
- ComponentType componentType = assemblyFactory.createComponentType();
- componentType.setUnresolved(true);
- componentType.setURI(implementation.getURI() + ".componentType");
- componentType = resolver.resolveModel(ComponentType.class, componentType);
- if (!componentType.isUnresolved()) {
-
- // We have a component type description, merge it into the POJO model
- implementation.getServices().addAll(componentType.getServices());
- implementation.getReferences().addAll(componentType.getReferences());
- implementation.getProperties().addAll(componentType.getProperties());
-
- } else {
-
- // We have no component type description, simply introspect the POJO and
- // create a single Service for it
- Service service = assemblyFactory.createService();
- service.setName(pojoClass.getSimpleName());
- JavaInterface javaInterface;
- try {
- javaInterface = javaFactory.createJavaInterface(pojoClass);
- } catch (InvalidInterfaceException e) {
- throw new ContributionResolveException(e);
- }
- JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
- interfaceContract.setInterface(javaInterface);
- service.setInterfaceContract(interfaceContract);
- implementation.getServices().add(service);
- }
-
- // Mark the implementation resolved now
- implementation.setUnresolved(false);
- }
-
- public void write(POJOImplementation model, XMLStreamWriter outputSource) throws ContributionWriteException {
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
deleted file mode 100644
index dbe956b8c6..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.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 pojo.provider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.osoa.sca.ServiceRuntimeException;
-
-class POJOImplementationInvoker implements Invoker {
-
- private Object pojoInstance;
- private Method method;
-
- POJOImplementationInvoker(Object pojoInstance, Operation operation, Method method) {
- this.pojoInstance = pojoInstance;
- this.method = method;
- }
-
- public Message invoke(Message msg) {
- try {
- msg.setBody(method.invoke(pojoInstance, (Object[])msg.getBody()));
- } catch (InvocationTargetException e) {
- msg.setFaultBody(e);
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- return msg;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
deleted file mode 100644
index b764148b67..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.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 pojo.provider;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.osoa.sca.ServiceRuntimeException;
-
-import pojo.POJOImplementation;
-
-/**
- * The model representing a sample CRUD implementation in an SCA assembly model.
- * The sample CRUD implementation is not a full blown implementation, it only
- * supports a subset of what a component implementation can support: - a single
- * fixed service (as opposed to a list of services typed by different
- * interfaces) - a directory attribute used to specify where a CRUD component is
- * going to persist resources - no references or properties - no policy intents
- * or policy sets
- */
-class POJOImplementationProvider implements ImplementationProvider {
-
- private POJOImplementation implementation;
- private Object pojoInstance;
-
- /**
- * Constructs a new CRUD implementation.
- */
- POJOImplementationProvider(RuntimeComponent component, POJOImplementation implementation) {
- this.implementation = implementation;
-
- // Create a new instance of the POJO
- try {
- pojoInstance = implementation.getPOJOClass().newInstance();
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- }
-
- public void start() {
- try {
- // Invoke the POJO's init method
- Method initMethod = implementation.getMethods().get("init");
- if (initMethod != null) {
- initMethod.invoke(pojoInstance);
- }
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- }
-
- public void stop() {
- try {
- // Invoke the POJO's destroy method
- Method destroyMethod = implementation.getMethods().get("destroy");
- if (destroyMethod != null) {
- destroyMethod.invoke(pojoInstance);
- }
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- } finally {
- pojoInstance = null;
- }
- }
-
- public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
- Method method = implementation.getMethods().get(operation.getName());
- POJOImplementationInvoker invoker = new POJOImplementationInvoker(pojoInstance, operation, method);
- return invoker;
- }
-
- public Invoker createCallbackInvoker(Operation operation) {
- Method method = implementation.getMethods().get(operation.getName());
- POJOImplementationInvoker invoker = new POJOImplementationInvoker(pojoInstance, operation, method);
- return invoker;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
deleted file mode 100644
index ce135b64cf..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.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 pojo.provider;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-import pojo.POJOImplementation;
-
-/**
- * The model representing a sample POJO implementation in an SCA assembly model.
- */
-public class POJOImplementationProviderFactory implements ImplementationProviderFactory<POJOImplementation> {
-
- public POJOImplementationProviderFactory(ExtensionPointRegistry registry) {
- }
-
- public Class<POJOImplementation> getModelType() {
- // Returns the type of model processed by this processor
- return POJOImplementation.class;
- }
-
- public ImplementationProvider createImplementationProvider(RuntimeComponent component, POJOImplementation implementation) {
- return new POJOImplementationProvider(component, implementation);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 8337e81c5f..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the artifact processor extension
-pojo.impl.POJOImplementationProcessor;qname=http://pojo#implementation.pojo,model=pojo.POJOImplementation,factory=pojo.POJOImplementationFactory
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index b30ea3b9cf..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the implementation extension
-pojo.provider.POJOImplementationProviderFactory;model=pojo.POJOImplementation
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
deleted file mode 100644
index 075af98240..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for implementation model factory
-pojo.impl.POJOImplementationFactoryImpl
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index cc32929f09..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package helloworld;
-
-public interface HelloWorld {
-
- String sayHello(String name);
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0580e30aba..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.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 helloworld;
-
-public class HelloWorldImpl {
-
- public void init() {
- System.out.println("Initializing POJO");
- }
-
- public void destroy() {
- System.out.println("Destroying POJO");
- }
-
- public String sayHello(String name) {
- System.out.println("Executing POJO sayHello");
- return "Hello " + name;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
deleted file mode 100644
index 69ab1f567e..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.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 helloworld;
-
-public class HelloWorldImpl2 {
-
- public void init() {
- System.out.println("Initializing POJO");
- }
-
- public void destroy() {
- System.out.println("Destroying POJO");
- }
-
- public String sayHello(String name) {
- System.out.println("Executing POJO sayHello");
- return "Hello " + name;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index b2a676be49..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- */
-public class HelloWorldTestCase extends TestCase {
-
- private SCADomain scaDomain;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void testHello() throws Exception {
- HelloWorld helloworld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent");
- assertEquals("Hello petra", helloworld.sayHello("petra"));
- }
-
- public void testHello2() throws Exception {
- HelloWorld helloworld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent2/HelloWorld2");
- assertEquals("Hello petra", helloworld.sayHello("petra"));
- }
-}
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
deleted file mode 100644
index a92c5ab8db..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
-
- <service name="HelloWorld2">
- <interface.java interface="helloworld.HelloWorld"/>
- </service>
-
-</componentType> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index c38094dfc9..0000000000
--- a/branches/sca-java-0.99/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://test/helloworld"
- xmlns:p="http://pojo"
- name="helloworld">
-
- <component name="HelloWorldComponent">
- <p:implementation.pojo class="helloworld.HelloWorldImpl" />
- </component>
-
- <component name="HelloWorldComponent2">
- <p:implementation.pojo class="helloworld.HelloWorldImpl2" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/loanapplication/pom.xml b/branches/sca-java-0.99/samples/loanapplication/pom.xml
deleted file mode 100644
index 96485ba8ad..0000000000
--- a/branches/sca-java-0.99/samples/loanapplication/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-loanapplication</artifactId>
- <name>Apache Tuscany Loan Application Conversation Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
deleted file mode 100644
index 4fedb70782..0000000000
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplication.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 loanapplication;
-
-public class LoanApplication {
-
- private String customerName;
- private float loanAmount;
-
- public LoanApplication(String customerName, float loanAmount) {
- this.customerName = customerName;
- this.loanAmount = loanAmount;
- }
-
- @Override
- public String toString() {
- return "[Customer: " + customerName + ", loan amount: "
- + loanAmount + "]";
- }
-}
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
deleted file mode 100644
index 5183ece867..0000000000
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.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 loanapplication;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-
-public class LoanApplicationClient {
-
- public static void main(String[] args) throws Exception {
- SCADomain domain = SCADomain.newInstance("loanapplication.composite");
-
- // Locate the MyClient component and invoke it
- LoanClient loanClient = domain.getService(LoanClient.class, "LoanClientComponent");
- loanClient.applyForLoan("John Doe", 1000.0f);
- System.out.println(loanClient.displayLoan());
- System.out.println("Loan approved: " + loanClient.isApproved());
-
- domain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
deleted file mode 100644
index 7e4438bbff..0000000000
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClient.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 loanapplication;
-
-public interface LoanClient {
-
- void applyForLoan(String customerName, float amount);
- boolean isApproved();
- boolean isCancelled();
- String displayLoan();
- void cancelLoan();
- void closeLoan();
-}
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
deleted file mode 100644
index b06d9465a2..0000000000
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package loanapplication;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class LoanClientImpl implements LoanClient {
-
- private LoanService loanService;
-
- @Reference
- public void setLoanService(LoanService loanService) {
- this.loanService = loanService;
- }
-
- public void applyForLoan(String customerName, float amount) {
- loanService.apply(new LoanApplication(customerName, amount));
- }
-
- public boolean isApproved() {
- if (loanService.getLoanStatus() == null) {
- return false;
- }
- return loanService.getLoanStatus().equals("approved");
- }
-
- public boolean isCancelled() {
- if (loanService.getLoanStatus() == null) {
- return false;
- }
- return loanService.getLoanStatus().equals("cancelled");
- }
-
- public String displayLoan() {
- return loanService.display();
- }
-
- public void cancelLoan() {
- loanService.cancelApplication();
- }
-
- public void closeLoan() {
- loanService.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanService.java
deleted file mode 100644
index 9dfd8b42fe..0000000000
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanService.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 loanapplication;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Conversational
-@Remotable
-public interface LoanService {
-
- void apply(LoanApplication application);
-
- void lockCurrentRate(int termInYears);
-
- @OneWay
- void cancelApplication();
-
- String getLoanStatus();
-
- String display();
-
- @EndsConversation
- void close();
-}
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
deleted file mode 100644
index 76a53323bd..0000000000
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package loanapplication;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("CONVERSATION")
-@AllowsPassByReference
-public class LoanServiceImpl implements LoanService {
-
- private LoanApplication application;
- private String status;
- private int termLocked = 0;
- @ConversationID
- protected String conversationID;
-
- public void apply(LoanApplication application) {
- this.application = application;
- status = "open";
- }
-
- public void lockCurrentRate(int termInYears) {
- termLocked = termInYears;
- status = "locked";
- }
-
- public void cancelApplication() {
- status = "cancelled";
- }
-
- public String getLoanStatus() {
- return status;
- }
-
- public String display() {
- return "Loan application: " + application + ", term: "
- + termLocked + ", status: " + status
- + ", conversationID: " + conversationID;
- }
-
- public void close() {
- this.application = null;
- this.status = "closed";
- }
-}
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/main/resources/loanapplication.composite b/branches/sca-java-0.99/samples/loanapplication/src/main/resources/loanapplication.composite
deleted file mode 100644
index 3aa8d030b7..0000000000
--- a/branches/sca-java-0.99/samples/loanapplication/src/main/resources/loanapplication.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://loanapplication"
- xmlns:la="http://loanapplication"
- name="loanapplication">
-
- <component name="LoanClientComponent">
- <implementation.java class="loanapplication.LoanClientImpl"/>
- <reference name="loanService" target="LoanServiceComponent"/>
- </component>
-
- <component name="LoanServiceComponent">
- <implementation.java class="loanapplication.LoanServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/branches/sca-java-0.99/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
deleted file mode 100644
index e88e48a53a..0000000000
--- a/branches/sca-java-0.99/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.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 loanapplication;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class LoanApplicationTestCase extends TestCase {
-
- private LoanClient loanClient;
- private SCADomain domain;
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("loanapplication.composite");
-
- loanClient = domain.getService(LoanClient.class, "LoanClientComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
- public void test() throws Exception {
- try {
- loanClient.applyForLoan("John Doe", 1000.0f);
- System.out.println("Applied: " + loanClient.displayLoan());
- System.out.println("Loan approved: " + loanClient.isApproved());
- loanClient.cancelLoan();
- System.out.println("Sleeping to let cancel complete ...");
- Thread.sleep(500);
- if (!loanClient.isCancelled()) {
- fail("Loan should be cancelled");
- }
- System.out.println("Cancelled: " + loanClient.displayLoan());
- loanClient.closeLoan();
-
- /* This is a mistake, after @EndsConversation, a new conversation is
- * started automatically, so we should not get TargetNotFoundException.
- * Keep this for the timeout case, where we should get the exception
- try {
- System.out.println("Trying to use the closed loan in the ended conversation ...");
- System.out.println("Closed: " + loanClient.displayLoan());
- fail("Target should not be found");
- } catch(TargetNotFoundException e) {
- System.out.println("Target not found as expected");
- }
- */
-
- // Now check that a new conversation's loan is not cancelled
-
- if (loanClient.isCancelled()) {
- fail("Loan should not be cancelled");
- }
- } catch(Throwable e) {
- e.printStackTrace();
- if (e instanceof Exception) {
- throw (Exception)e;
- }
- if (e instanceof Error) {
- throw (Error)e;
- }
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/pom.xml b/branches/sca-java-0.99/samples/old/bigbank/account/pom.xml
deleted file mode 100644
index 991935e07b..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/pom.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <parent>
- <groupId>org.apache.tuscany.samples.bigbank</groupId>
- <artifactId>bigbank-scenario</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>sample-bigbank-account</artifactId>
- <packaging>war</packaging>
- <name>Tuscany BigBank Account Module</name>
- <description>BigBank Scenario - Account Management Module</description>
- <dependencies>
-
-
- <dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-api</artifactId>
- <version>${scaKernelVersion}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
- <artifactId>webapp-api</artifactId>
- <version>${scaKernelVersion}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- java.xml.stream API -->
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>compile</scope>
- </dependency>
- <!-- StAX implementation -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.0</version>
- <scope>runtime</scope>
- </dependency>
-
-
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubatingversion>
- <scope>compile</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.tuscany.das</groupId>
- <artifactId>tuscany-das-rdb</artifactId>
- <version>${dasVersion}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.2.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating</version>
- <executions>
- <execution>
- <configuration>
- <!-- schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile -->
- <schemaDir>${basedir}/src/main/resources/wsdl</schemaDir>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca.extensions.axis2.plugins</groupId>
- <artifactId>tuscany-plugin-wsdl2java</artifactId>
- <version>${scaKernelVersion}</version>
- <executions>
- <execution>
- <configuration>
- <wsdlFiles>
- <wsdlFile>
- <fileName>${basedir}/src/main/resources/wsdl/stockquotes.webservicex.wsdl</fileName>
- <ports>
- <port>StockQuoteSoap</port>
- </ports>
- </wsdlFile>
- <wsdlFile>
- <fileName>${basedir}/src/main/resources/wsdl/AccountService.wsdl</fileName>
- </wsdlFile>
- </wsdlFiles>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
- <artifactId>tuscany-war-plugin</artifactId>
- <version>${scaKernelVersion}</version>
- <executions>
- <execution>
- <id>tuscany-war</id>
- <goals>
- <goal>tuscany-war</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <!-- Set to true to embed external jars for extensions in the WAR -->
- <!-- Set to false to leave external jars for extensions to be resolved from maven repository -->
- <loadExtensionDependencies>false</loadExtensionDependencies>
-
- <extensions>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>tuscany-axis2</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- </extensions>
-
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java
deleted file mode 100644
index 74baa636f5..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/account/AccountServiceImpl.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package bigbank.account.services.account;
-
-import java.rmi.RemoteException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import bigbank.account.services.accountdata.AccountDataService;
-import bigbank.account.services.stockquote.StockQuote;
-import bigbank.account.services.stockquote.StockQuoteService;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountService;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-@Service(interfaces = AccountService.class)
-public class AccountServiceImpl implements AccountService {
-
- public static final String CHECKING_ACCOUNT_PREFIX = "134-43-394";
-
- public static final String SAVINGS_ACCOUNT_PREFIX = "134-42-623";
-
- public static final String ACCOUNT_TYPE_SAVINGS = "savings";
-
- public static final String ACCOUNT_TYPE_CHECKINGS = "checkings";
-
- public static final DateFormat tsformatXSDDateTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSz");
- static {
- AccountServiceImpl.tsformatXSDDateTime.setTimeZone(TimeZone.getTimeZone("UTC"));
- }
-
- private float currencyConversion = 0.0f;
-
- private String currency = "USD";
-
- @Property
- public void setCurrency(final String currency) {
- this.currency = currency;
- }
-
- float getCurrencyConversion() {
- if (currencyConversion == 0.0F) {
- if ("USD".equals(currency)) {
- currencyConversion = 1.0f;
- } else if ("EURO".equals(currency)) {
- currencyConversion = 0.8f;
- } else {
- try {
- currencyConversion = Float.parseFloat(currency);
- } catch (Exception e) {
- currencyConversion = 1.0f;
- }
-
- }
-
- }
- return currencyConversion;
-
- }
-
- private AccountDataService accountDataService;
-
- @Reference
- public void setAccountDataService(AccountDataService accountDataService) {
- this.accountDataService = accountDataService;
- }
-
- private StockQuoteService stockQuoteService;
-
- @Reference
- public void setStockQuoteService(StockQuoteService stockQuoteService) {
- this.stockQuoteService = stockQuoteService;
- }
-
- public AccountServiceImpl() {
- }
-
- @SuppressWarnings("unchecked")
- public AccountReport getAccountReport(int customerID) throws RemoteException {
-
- try {
- AccountReport accountReport = accountDataService.getAccountReport(customerID);
- // convert to local currency.
- List<AccountSummary> accounts = accountReport.getAccountSummaries();
- for (AccountSummary accountSummary : accounts) {
- accountSummary.setBalance(fromUSDollarToCurrency(accountSummary.getBalance()));
-
- }
- return updateStockInformation(accountReport);
- } catch (Exception e) {
- e.printStackTrace();
- if (e instanceof RemoteException) {
- throw (RemoteException) e;
- } else {
- throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
- }
- }
- }
-
- private AccountReport updateStockInformation(AccountReport accountReport) throws RemoteException {
- List<StockSummary> stocks = accountReport.getStockSummaries();
- if (stocks.size() < 1) {
- return accountReport; // nothing todo
- }
- HashSet<String> owned = new HashSet<String>(stocks.size());
- for (StockSummary stock : stocks) {
- owned.add(stock.getSymbol());
- }
- ArrayList<String> ownedStr = new ArrayList<String>(owned.size() * 5);
- for (String s : owned) {
-
- ownedStr.add(s);
- }
-
- Map<String, StockQuote> stockInfo = stockQuoteService.getQuotes(ownedStr.toArray(new String[owned.size()]));
-
- for (StockSummary stock : stocks) {
- String symbol = stock.getSymbol();
- StockQuote stockquote = stockInfo.get(symbol);
- if (stockquote == null) {
- stock.setCurrentPrice(Float.NaN);
- stock.setCompany("*not found*");
- stock.setHighPrice(Float.NaN);
- stock.setLowPrice(Float.NaN);
-
- } else {
- stock.setCurrentPrice(fromUSDollarToCurrency(convertToFloat(stockquote.getStockQuote())));
- stock.setCompany(stockquote.getCompanyName());
- stock.setHighPrice(fromUSDollarToCurrency(convertToFloat(stockquote.getDayHighPrice())));
- stock.setLowPrice(fromUSDollarToCurrency(convertToFloat(stockquote.getDayLowPrice())));
- }
- }
-
- return accountReport;
- }
-
- float convertToFloat(final String s) {
-
- try {
- return Float.parseFloat(s);
- } catch (Exception e) {
- return Float.NaN;
- }
-
- }
-
- private float fromUSDollarToCurrency(float value) {
- return value * getCurrencyConversion();
-
- }
-
- private float toUSDollarfromCurrency(float value) {
-
- return value / getCurrencyConversion();
- }
-
- public CustomerProfileData getCustomerProfile(String logonID) throws RemoteException {
-
- try {
- return accountDataService.getCustomerProfile(logonID);
- } catch (Exception e) {
- e.printStackTrace();
- if (e instanceof RemoteException) {
- throw (RemoteException) e;
- } else {
- throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
- }
- }
-
- }
-
- public float deposit(String account, float ammount) throws RemoteException {
- try {
- return accountDataService.deposit(account, toUSDollarfromCurrency(ammount));
- } catch (RemoteException e) {
- e.printStackTrace();
- throw e;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
- }
- }
-
- public StockSummary purchaseStock(int id, StockSummary stock) throws RemoteException {
- try {
- String symbol = stock.getSymbol();
- Map<String, StockQuote> stockInfo = stockQuoteService.getQuotes(new String[] { symbol });
-
- StockQuote stockQuote = stockInfo.get(symbol);
- stock.setPurchasePrice(Float.parseFloat(stockQuote.getStockQuote()));
- String purchaseDate = tsformatXSDDateTime.format(new Date());
- if (purchaseDate.endsWith("UTC")) {
- purchaseDate = purchaseDate.substring(0, purchaseDate.length() - 3) + "Z";
- }
- stock.setPurchaseDate(purchaseDate);
-
- return accountDataService.purchaseStock(id, stock);
- } catch (RemoteException e) {
- e.printStackTrace();
- throw e;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
- }
- }
-
- public StockSummary sellStock(int purchaseLotNumber, int quantity) throws RemoteException {
- try {
- return accountDataService.sellStock(purchaseLotNumber, quantity);
- } catch (RemoteException e) {
- e.printStackTrace();
- throw e;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
- }
- }
-
- public float withdraw(String account, float ammount) throws RemoteException {
- try {
- return accountDataService.withdraw(account, toUSDollarfromCurrency(ammount));
- } catch (RemoteException e) {
- e.printStackTrace();
- throw e;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
- }
- }
-
- public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
- throws RemoteException {
- try {
- return accountDataService.createAccount(customerProfile, createSavings, createCheckings);
- } catch (RemoteException e) {
- e.printStackTrace();
- throw e;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
- }
- }
-
- public AccountLog getAccountLog(final int customerID) throws RemoteException {
- return accountDataService.getAccountLog(customerID);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
deleted file mode 100644
index 884127cd9e..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account.services.accountdata;
-
-public interface AccountDataService {
-
- /**
- * Auto generated method signatures
- *
- * @param param0*
- * @param param1*
- * @param param2
- */
- public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param4
- */
- public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param6*
- * @param param7
- */
- public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param9*
- * @param param10*
- * @param param11
- */
- public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
- throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param13*
- * @param param14
- */
- public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param16*
- * @param param17
- */
- public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param19
- */
- public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param0
- */
- public com.bigbank.account.AccountLog getAccountLog(int param0) throws java.rmi.RemoteException;
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
deleted file mode 100644
index c346a3221f..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account.services.accountdata;
-
-import java.io.InputStream;
-import java.rmi.RemoteException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-import java.util.TimeZone;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.Converter;
-import org.apache.tuscany.das.rdb.DAS;
-import org.osoa.sca.annotations.Service;
-
-import bigbank.account.services.account.AccountServiceImpl;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-import commonj.sdo.DataObject;
-
-@Service(CustomerIdService.class)
-public class AccountDataServiceDASImpl implements CustomerIdService { // TODO fix this!
-
- static public String dbDirectory = null;
-
- public static final DateFormat tsformatXSDDateTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSz");
-
- public static final DateFormat sqlformatDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSz");
-
- static {
- tsformatXSDDateTime.setTimeZone(TimeZone.getTimeZone("UTC"));
-
- }
-
- public CustomerProfileData getCustomerProfile(String logonID) throws RemoteException {
-
- try {
- InputStream mapping = createConfigStream();
- Connection conn = getConnection();
- DAS das = DAS.FACTORY.createDAS(mapping, conn);
-
- Command select = das.createCommand("SELECT firstName, lastName, loginID, password, id FROM customers where loginID = ?");
-
- select.setParameter(1, logonID);
-
- DataObject root = select.executeQuery();
- conn.close();
-
- Collection customers = root.getList("CustomerProfileData");
- CustomerProfileData customerProfileData = (CustomerProfileData) customers.iterator().next();
-
- return customerProfileData;
- } catch (Exception e) {
-
- e.printStackTrace();
- RemoteException re = new RemoteException("Failed to get customer profile'" + logonID + "' ", e);
- re.printStackTrace();
- throw re;
- }
- }
-
- protected static final String driver = "org.apache.derby.jdbc.EmbeddedDriver";
-
- protected static final String protocol = "jdbc:derby:";
-
- public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
- throws RemoteException {
-
- try {
- DAS das = DAS.FACTORY.createDAS(getConnection());
- Command insert = das.createCommand("insert into customers (firstName,lastName,address,email, loginID, password ) values ('"
- + customerProfile.getFirstName() + "', '" + customerProfile.getLastName() + "', '" + customerProfile.getAddress() + "', '"
- + customerProfile.getEmail() + "', '" + customerProfile.getLoginID() + "', '" + customerProfile.getPassword() + "')");
-
- insert.execute();
- CustomerProfileData ret = getCustomerProfile(customerProfile.getLoginID());
- String cid = ret.getId() + "";
- if (createSavings) {
- insert = das.createCommand("insert into accounts (id,accountNumber, accountType, balance ) values (" + cid + ", '"
- + AccountServiceImpl.SAVINGS_ACCOUNT_PREFIX + cid + "', '" + AccountServiceImpl.ACCOUNT_TYPE_SAVINGS + "', " + 1.0F + ")");
- insert.execute();
-
- }
- if (createCheckings) {
- insert = das.createCommand("insert into accounts (id,accountNumber, accountType, balance ) values (" + cid + ", '"
- + AccountServiceImpl.CHECKING_ACCOUNT_PREFIX + cid + "', '" + AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS + "', " + 1.0F + ")");
- insert.execute();
-
- }
-
- return ret;
- } catch (Exception e) {
- if (e instanceof RemoteException) {
- throw (RemoteException) e;
- }
- throw new RemoteException("createAccount " + e.getClass().getName() + "'. " + e.getMessage(), e);
- }
- }
-
- public CustomerProfileData createAccountNOTWORKING(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
- throws RemoteException {
- try {
- DAS das = DAS.FACTORY.createDAS(createConfigStream(), getConnection());
- Command read = das.getCommand("all customers");
-
- // select.setDataObjectModel();
- DataObject root = read.executeQuery();
-
- // Create a new stockPurchase
- DataObject customer = root.createDataObject("customerProfileData");
-
- // THIS SEEMS TO BE THE ONLY WAY TO DO THIS .. NO WAY TO JUST ADD AN EXISTING CUSTOMER.
- customer.set("firstName", customerProfile.getFirstName());
- customer.set("lastName", customerProfile.getLastName());
- customer.set("address", customerProfile.getAddress());
- customer.set("email", customerProfile.getEmail());
- customer.set("loginID", customerProfile.getLoginID());
- customer.set("password", customerProfile.getPassword());
-
- das.applyChanges(root);
- return getCustomerProfile(customerProfile.getLoginID());
-
- } catch (Exception e) {
- if (e instanceof RemoteException) {
- throw (RemoteException) e;
- }
- throw new RemoteException("createAccount " + e.getClass().getName() + "'. " + e.getMessage(), e);
- }
-
- }
-
- public AccountReport getAccountReport(final int customerID) throws RemoteException {
- try {
- final AccountFactory accountFactory = AccountFactory.INSTANCE;
- final AccountReport accountReport = accountFactory.createAccountReport();
- InputStream mapping = createConfigStream();
-
- Connection conn = getConnection();
- DAS das = DAS.FACTORY.createDAS(mapping, conn);
-
- Command select = das.createCommand("SELECT accountNumber, accountType, balance FROM accounts where id = ?");
- select.setParameter(1, customerID);
-
- DataObject root = select.executeQuery();
- accountReport.getAccountSummaries().addAll(root.getList("AccountSummary"));
-
- // Get Stocks
-
- select = das.createCommand("SELECT Symbol, quantity, purchasePrice, purchaseDate, purchaseLotNumber FROM stocks where id = ?");
- select.setParameter(1, customerID);
-
- // select.addConverter("STOCKS.PURCHASEDATE", DateConverter.class.getName());
-
- root = select.executeQuery();
- accountReport.getStockSummaries().addAll(root.getList("StockSummary"));
-
- conn.close();
-
- return accountReport;
- } catch (Exception e) {
- if (e instanceof RemoteException) {
- throw (RemoteException) e;
- }
- throw new RemoteException("getAccountReport failed. customerID ('" + customerID + "')" + e.getClass().getName() + "'. " + e.getMessage(),
- e);
- }
- }
-
- public float withdraw(String account, float ammount) throws RemoteException {
-
- return deposit(account, -ammount);
- }
-
- public float deposit(String account, float ammount) throws RemoteException {
-
- try {
- Connection conn = getConnection();
- DAS das = DAS.FACTORY.createDAS(createConfigStream(), conn);
-
- Command select = das.createCommand("SELECT accountNumber, balance FROM accounts where accountNumber = ?");
- select.setParameter(1, account);
-
- DataObject root = select.executeQuery();
- Collection accounts = root.getList("AccountSummary");
- AccountSummary accountData = (AccountSummary) accounts.iterator().next();
- float newbalance = accountData.getBalance() + ammount;
- accountData.setBalance(newbalance);
- // update department set companyid = ? where department.name = ?
-
- Command update = das.getCommand("update balance");
- update.setParameter(1, new Float(newbalance));
- update.setParameter(2, account);
- update.execute();
- conn.close();
- return newbalance;
- } catch (Exception e) {
- throw new RemoteException(e.getClass().getName(), e);
- }
-
- }
-
- public StockSummary sellStock(int purchaseLotNumber, int quantity) throws RemoteException {
- try {
- DAS das = DAS.FACTORY.createDAS(createConfigStream(), getConnection());
-
- Command read = das.getCommand("stockbylotSelect");
- read.setParameter(1, purchaseLotNumber);// autoboxing :-)
- DataObject root = read.executeQuery();
- List stocks = root.getList("StockSummary");
- if (null != stocks && !stocks.isEmpty()) {
- StockSummary stock = (StockSummary) stocks.get(0);
- int newQuatity = Math.max(stock.getQuantity() - quantity, 0);
- if (newQuatity < 1) {
-
- Command delete = das.createCommand("DELETE FROM STOCKS WHERE PURCHASELOTNUMBER = ?");
- delete.setParameter(1, purchaseLotNumber);
- delete.execute();
-
- } else {
-
- Command update = das.getCommand("stockbylot");
-
- update.setParameter(1, newQuatity);
- update.setParameter(2, purchaseLotNumber);
- update.execute();
-
- stock.setQuantity(newQuatity);
- }
- return stock;
- }
-
- return null;
- } catch (Exception e) {
- throw new RemoteException("sellStock", e);
- }
- }
-
- public StockSummary purchaseStock(int id, StockSummary stock) throws RemoteException {
-
- try {
- DAS das = DAS.FACTORY.createDAS(getConnection());
- Command insert = das.createCommand("insert into stocks (id, symbol, quantity, purchasePrice, purchaseDate) values (?,?,?,?,?)");
- insert.setParameter(1, new Integer(id));
- insert.setParameter(2, stock.getSymbol());
- insert.setParameter(3, stock.getQuantity());
- insert.setParameter(4, stock.getPurchasePrice());
- insert.setParameter(5, DateConverter.INSTANCE.getColumnValue(stock.getPurchaseDate()));
-
- insert.execute();
-
- return stock;
- } catch (Exception e) {
- if (e instanceof RemoteException) {
- throw (RemoteException) e;
- }
- throw new RemoteException("purchaseStock " + e.getClass().getName() + "'. " + e.getMessage(), e);
- }
- }
-
- protected Connection getConnection() throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException {
- Connection conn;
- Class.forName(driver).newInstance();
- Properties props = new Properties();
- // props.put("user", "tuscany");
- // props.put("password", "tuscany");
- conn = DriverManager.getConnection(protocol + dbDirectory + ";create=true", props);
-
- conn.setAutoCommit(false);
- return conn;
- }
-
- protected InputStream createConfigStream() {
- InputStream mapping = getClass().getClassLoader().getResourceAsStream("DasAccountConfiguration.xml");
- return mapping;
- }
-
- public static class DateConverter implements Converter {
- public final static DateConverter INSTANCE = new DateConverter();
-
- public DateConverter() { // public empty constructor
- }
-
- public Object getPropertyValue(Object columnData) {
-
- try {
-
- String ret = tsformatXSDDateTime.format(columnData);
- if (ret.endsWith("UTC")) {
- ret = ret.substring(0, ret.length() - 3) + "Z";
- }
- return ret;
-
- } catch (Exception e) {
-
- e.printStackTrace();
- throw new IllegalArgumentException(e);
- }
-
- }
-
- public Object getColumnValue(Object propertyData) {
-
- if (propertyData instanceof java.util.Date) {
- // Need to convert back to local time for DB and remove timezone notation at the end..
- String ret = sqlformatDateTime.format(propertyData);
- char lc = ret.charAt(ret.length() - 1);
- while (!Character.isDigit(lc)) {
- ret = ret.substring(0, ret.length() - 1);
- lc = ret.charAt(ret.length() - 1);
- }
- return ret;
- } else if (propertyData instanceof String) {
-
- try {
- String time = (String) propertyData;
- char last = time.charAt(time.length() - 1);
- if (last == 'z' || last == 'Z') {
- time = time.substring(0, time.length() - 1);
- }
- if (!time.endsWith("UTC")) {
- time = time + "UTC";
- }
- return getColumnValue(tsformatXSDDateTime.parse(time));
- } catch (ParseException e) {
- throw new IllegalArgumentException("'" + propertyData + "' does not parse to date.");
- }
- } else {
- throw new IllegalArgumentException();
- }
-
- }
-
- }
-
- public int getCustomerIdByPurchaseLotNumber(int purchaseLotNumber) throws RemoteException {
-
- return queryCustomerId("select id from stocks where purchaseLotNumber = " + purchaseLotNumber);
- }
-
- public int getCustomerIdByAccount(String account) throws RemoteException {
-
- return queryCustomerId("select id from accounts where accountNumber = '" + account + "'");
- }
-
- private int queryCustomerId(String query) throws RemoteException {
-
- try {
- Connection conn = getConnection();
-
- Statement s = conn.createStatement();
-
- ResultSet rs = s.executeQuery(query);
- int id = -1;
- if (rs.next()) {
- id = rs.getInt("id");
- }
-
- conn.commit();
-
- rs.close();
- s.close();
- conn.close();
-
- return id;
-
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass().getName(), e);
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index 5e08cf634f..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-import java.util.List;
-
-import org.osoa.sca.annotations.Service;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-@Service(AccountDataService.class)
-public class AccountDataServiceImpl implements AccountDataService {
-
- public CustomerProfileData getCustomerProfile(String logonID) throws RemoteException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public AccountReport getAccountReport(int customerID) {
- final AccountFactory accountFactory = AccountFactory.INSTANCE;
- AccountReport accountReport = accountFactory.createAccountReport();
- List accounts = accountReport.getAccountSummaries();
-
- AccountSummary account = accountFactory.createAccountSummary();
- account.setAccountType("1111");
- account.setAccountNumber("22-22-22");
- account.setBalance(123.45F);
- accounts.add(account);
-
- account = accountFactory.createAccountSummary();
- account.setAccountType("04-11-19");
- account.setAccountNumber("11-23");
- account.setBalance(543.21F);
- accounts.add(account);
-
- List stocks = accountReport.getStockSummaries();
- StockSummary stock = accountFactory.createStockSummary();
- stock.setSymbol("IBM");
- stock.setPurchaseDate("1999-11-23");
- stock.setPurchaseLotNumber(101);
- stock.setPurchasePrice(33.33F);
- stock.setQuantity(10);
- stocks.add(stock);
-
- stock = accountFactory.createStockSummary();
- stock.setSymbol("TUSK");
- stock.setPurchaseDate("2005-01-05");
- stock.setPurchaseLotNumber(102);
- stock.setPurchasePrice(11.11F);
- stock.setQuantity(4);
- stocks.add(stock);
- return accountReport;
- }
-
- public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
- throws RemoteException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public float deposit(String param6, float param7) throws RemoteException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public StockSummary purchaseStock(int param0, StockSummary stock) throws RemoteException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public StockSummary sellStock(int param13, int param14) throws RemoteException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public float withdraw(String param16, float param17) throws RemoteException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public AccountLog getAccountLog(final int customerID) throws RemoteException {
- throw new RemoteException("This method should not be called");
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
deleted file mode 100644
index b355a09008..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdata/CustomerIdService.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 bigbank.account.services.accountdata;
-
-import java.rmi.RemoteException;
-
-/**
- * This interface allows access to a customer's id from the data service.
- */
-public interface CustomerIdService {
-
- /*
- * Return -1 if purchaseLotNumber not found
- */
- public int getCustomerIdByPurchaseLotNumber(int purchaseLotNumber) throws RemoteException;
-
- /*
- * Return -1 if account not found
- */
- public int getCustomerIdByAccount(String account) throws RemoteException;
-
- // TODO (isilval) Fix this !!!
- // Apparently, configuration can't deal with extends so I am adding the contents of AccountDataService here
-
- /**
- * Auto generated method signatures
- *
- * @param param0*
- * @param param1*
- * @param param2
- */
- public com.bigbank.account.StockSummary purchaseStock(int param0, com.bigbank.account.StockSummary parm1) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param4
- */
- public com.bigbank.account.CustomerProfileData getCustomerProfile(java.lang.String param4) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param6*
- * @param param7
- */
- public float deposit(java.lang.String param6, float param7) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param9*
- * @param param10*
- * @param param11
- */
- public com.bigbank.account.CustomerProfileData createAccount(com.bigbank.account.CustomerProfileData param9, boolean param10, boolean param11)
- throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param13*
- * @param param14
- */
- public com.bigbank.account.StockSummary sellStock(int param13, int param14) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param16*
- * @param param17
- */
- public float withdraw(java.lang.String param16, float param17) throws java.rmi.RemoteException;
-
- /**
- * Auto generated method signatures
- *
- * @param param19
- */
- public com.bigbank.account.AccountReport getAccountReport(int param19) throws java.rmi.RemoteException;
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
deleted file mode 100644
index 1225c95f84..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account.services.accountdb;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Properties;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.Converter;
-import org.apache.tuscany.das.rdb.DAS;
-import org.apache.tuscany.das.rdb.config.ConfigFactory;
-import org.apache.tuscany.sdo.util.SDOUtil;
-
-import bigbank.account.services.account.AccountServiceImpl;
-import bigbank.account.services.accountdata.AccountDataServiceDASImpl;
-import bigbank.account.services.accountlogger.AccountLoggerServiceImpl;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountSummary;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-import commonj.sdo.DataObject;
-import com.bigbank.account.purchaseStock;
-import com.bigbank.account.withdraw;
-
-public class AccountDBInit extends HttpServlet {
-
- private static final long serialVersionUID = -4795999792460944805L;
-
- protected static final String driver = "org.apache.derby.jdbc.EmbeddedDriver";
-
- protected static final String protocol = "jdbc:derby:";
-
- protected String dbDirectory = null;
-
- protected String dasConfigFile = null;
-
- boolean deleteExisting = false;
-
- @Override
- public void init() throws ServletException {
- try {
-
- registerTypes();
- ServletConfig servletConfig = getServletConfig();
- ServletContext servletContext = servletConfig.getServletContext();
- dbDirectory = servletContext.getRealPath("WEB-INF/bigbankdb/accounts");
- dasConfigFile = servletContext.getRealPath("WEB-INF/classes/DasAccountConfiguration.xml");
- deleteExisting = false;
-
- createDB(dbDirectory);
-
- } catch (Exception e) {
-
- e.printStackTrace();
- log(e.toString(), e);
- throw new ServletException(e);
- }
- }
-
- /*
- * (non-Java-doc)
- *
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest arg0, HttpServletResponse arg1)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- response.setContentType("text/html");
-
- PrintWriter out = response.getWriter();
-
- out.println();
- out.println("<center><h2>BigBank database initialization servlet !<h2></center>");
- out.println();
- }
-
- public AccountDBInit() {
- }
-
- public AccountDBInit(String dbDirectory, String dasConfigFile, Boolean deleteExisting) {
- this.dbDirectory = dbDirectory;
- this.dasConfigFile = dasConfigFile;
- this.deleteExisting = deleteExisting;
- }
-
- private Connection createConnection() throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException {
- return createConnection(dbDirectory);
- }
-
- private static Connection createConnection(final String location) throws InstantiationException, IllegalAccessException, ClassNotFoundException,
- SQLException {
- Connection conn;
- Class.forName(driver).newInstance();
- Properties props = new Properties();
- conn = DriverManager.getConnection(protocol + location + ";create=true", props);
-
- conn.setAutoCommit(false);
- return conn;
- }
-
- public static void createDB(final String location) throws Exception {
- Connection conn = null;
- AccountDataServiceDASImpl.dbDirectory = location;
- AccountLoggerServiceImpl.dbDirectory = location; // TODO get rid of this (isilval)
- Exception processessingException = null;
- try {
- conn = createConnection(location);
-
- creatTables(conn);
-
- int id = createCustomer(conn, "Test", "User", "304 Fox Trot ln, Apex, NC", "test@das.org", "test", "password");
- createAccount(conn, id, AccountServiceImpl.SAVINGS_ACCOUNT_PREFIX + id, AccountServiceImpl.ACCOUNT_TYPE_SAVINGS, 123.43F);
- createAccount(conn, id, AccountServiceImpl.CHECKING_ACCOUNT_PREFIX + id, AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS, 23.12F);
- createStockPurchase(conn, id, "IBM", 33, 66.20F, "2005-11-23 13:22:02");
- createStockPurchase(conn, id, "DELL", 13, 12.74F, "2003-01-03 11:04:03");
- createStockPurchase(conn, id, "LU", 7, 2.74F, "2003-01-04 16:04:03");
- createStockPurchase(conn, id, "IBM", 22, 81.43F, "2004-02-03 13:04:33");
-
- id = createCustomer(conn, "test2", "demo2", "Pleasant Plains Rd, ViewMount, CO", "test2@das.org", "test2", "password");
- createAccount(conn, id, AccountServiceImpl.SAVINGS_ACCOUNT_PREFIX + id, AccountServiceImpl.ACCOUNT_TYPE_SAVINGS, 924.40F);
- createAccount(conn, id, AccountServiceImpl.CHECKING_ACCOUNT_PREFIX + id, AccountServiceImpl.ACCOUNT_TYPE_CHECKINGS, 33.26F);
- createStockPurchase(conn, id, "FOO", 3, 6.20F, "2000-09-11 09:11:01");
-
- conn.commit();
-
- } catch (org.apache.derby.impl.jdbc.EmbedSQLException e) {
- if (conn != null && !conn.isClosed()) {
- conn.rollback();
- }
- if (e.getErrorCode() == 20000 && "X0Y32".equalsIgnoreCase(e.getSQLState()) && -1 != e.getMessage().indexOf("already exists")) {
- // this is ok the database is there.
-
- } else {
-
- e.printStackTrace();
- processessingException = e;
- throw e;
- }
- } finally {
- try {
- if (null != conn && !conn.isClosed()) {
-
- conn.close();
- }
- conn = null;
- } catch (Exception e) {
- e.printStackTrace();
- if (null != processessingException) {
- throw e;
- }
- }
- }
-
- }
-
- protected static void creatTables(Connection conn) throws Exception {
- Statement s = conn.createStatement();
-
- s
- .execute("create table customers(firstName varchar(80) NOT NULL, lastName varchar(80), address varchar(180),email varchar(40),loginID varchar(80) NOT NULL UNIQUE, password varchar(80), id int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY)");
-
- s.execute("create table accounts(id int NOT NULL, accountNumber varchar(80) NOT NULL UNIQUE, accountType varchar(80), balance real )");
-
- s
- .execute("create table stocks(id int NOT NULL, Symbol varchar(8) NOT NULL, quantity int NOT NULL, purchasePrice real NOT NULL, purchaseDate TIMESTAMP, purchaseLotNumber int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY )");
-
- s
- .execute("create table acctLog (logSeqNo int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY, id int NOT NULL, accountNumber varchar(80) NOT NULL, actionType varchar(32) NOT NULL, amount real )");
-
- s
- .execute("create table stockLog (logSeqNo int NOT NULL PRIMARY KEY GENERATED ALWAYS AS IDENTITY, id int NOT NULL, Symbol varchar(8) NOT NULL, quantity int NOT NULL, actionType varchar(32) NOT NULL, purchaseLotNumber int NOT NULL )");
-
- s.close();
- }
-
- protected static int createCustomer(Connection conn, final String firstName, final String lastName, final String address, final String email,
- final String logonID, final String password) throws SQLException, Exception {
- Statement s = conn.createStatement();
-
- s.execute("insert into customers (firstName,lastName,address,email, loginID, password ) " + "values ('" + firstName + "', '" + lastName
- + "', '" + address + "', '" + email + "', '" + logonID + "', '" + password + "')");
-
- ResultSet rs = s.executeQuery("SELECT loginID, id FROM customers where loginID='" + logonID + "'");
- if (!rs.next()) {
- throw new Exception("Wrong number of rows");
- }
- int id = rs.getInt(2);
- s.close();
-
- return id;
- }
-
- protected static void createAccount(Connection conn, int customerID, final String accountNumber, final String accountType, final float balance)
- throws SQLException, Exception {
- Statement s = conn.createStatement();
-
- s.execute("insert into accounts (id,accountNumber, accountType, balance ) " + "values (" + customerID + ", '" + accountNumber + "', '"
- + accountType + "', " + balance + ")");
-
- s.close();
- }
-
- protected InputStream createConfigStream() {
- InputStream mapping = getClass().getClassLoader().getResourceAsStream("DasAccountConfiguration.xml");
- return mapping;
- }
-
- protected static void createStockPurchase(Connection conn, int customerID, final String stockSymbol, final int quantity,
- final float purchasePrice, String purchaseDate) throws SQLException, Exception {
- Statement s = conn.createStatement();
-
- s.execute("insert into stocks (id, symbol, quantity, purchasePrice, purchaseDate ) values (" + customerID + ", '" + stockSymbol + "', "
- + quantity + ", " + purchasePrice + ", '" + purchaseDate + "')");
-
- s.close();
-
- }
-
- protected static void registerTypes() {
- SDOUtil.registerStaticTypes(AccountFactory.class);
- // TODO remove
- SDOUtil.registerStaticTypes(ConfigFactory.class);
-
- }
-
- public void testWithdrawThroughDAS(withdraw wd) throws Exception {
-
- Connection conn = createConnection();
- DAS das = DAS.FACTORY.createDAS(createConfigStream(), conn);
- Command select = das.getCommand("get account");
-
- select.setParameter(1, wd.getAccountNumber());
-
- DataObject root = select.executeQuery();
-
- Collection accounts = root.getList("AccountSummary");
- AccountSummary account = (AccountSummary) accounts.iterator().next();
- float newbalance = account.getBalance() - wd.getAmount();
- account.setBalance(newbalance);
- // update department set companyid = ? where department.name = ?
-
- Command update = das.getCommand("update balance");
- update.setParameter(1, new Float(newbalance));
- update.setParameter(2, wd.getAccountNumber());
-
- update.execute();
- conn.close();
- }
-
- protected void testStrockPurchaseThroughDAS(purchaseStock sp) throws InstantiationException, IllegalAccessException, ClassNotFoundException,
- SQLException {
-
- DAS das = DAS.FACTORY.createDAS(createConfigStream(), createConnection());
- Command read = das.getCommand("all stocks");
-
- DataObject root = read.executeQuery();
-
- // Create a new stockPurchase
- DataObject stockPurchase = root.createDataObject("StockSummary");
- stockPurchase.set("id", new Integer(sp.getId()));
- stockPurchase.set("symbol", sp.getStock().getSymbol());
- stockPurchase.set("quantity", new Integer(sp.getStock().getQuantity()));
- stockPurchase.set("purchasePrice", new Float(11.00));
- // String type = stockPurchase.getType().getProperty("purchaseDate").getType().toString();
- stockPurchase.setDate("purchaseDate", new Date());
-
- das.applyChanges(root);
- }
-
- public CustomerProfileData testgetCustomerByLoginIDThroughDASRead(final String logonID) throws Exception {
- InputStream mapping = createConfigStream();
- Connection conn = createConnection();
- DAS das = DAS.FACTORY.createDAS(mapping, conn);
- Command select = das.createCommand("SELECT firstName, lastName, loginID, password, id FROM customers where loginID = ?");
-
- select.setParameter(1, logonID);
-
- DataObject root = select.executeQuery();
- conn.close();
-
- Collection customers = root.getList("CustomerProfileData");
- CustomerProfileData customerProfileData = (CustomerProfileData) customers.iterator().next();
- System.out.println(customerProfileData);
- System.out.flush();
- return customerProfileData;
-
- }
-
- protected void readDBstdout(PrintStream stream) throws Exception {
- Connection conn = null;
- try {
- conn = createConnection(dbDirectory);
- Statement s = conn.createStatement();
- ResultSet rs = s.executeQuery("SELECT firstName, lastName, loginID, password, id FROM customers ORDER BY lastName");
- while (rs.next()) {
- stream.print(rs.getString(1));
- stream.print(" ");
- stream.print(rs.getString(2));
- stream.print(" ");
- stream.print(rs.getString(3));
- stream.print(" ");
- stream.print(rs.getString(4));
- stream.print(" ");
- stream.print(rs.getString(5));
- stream.println();
- int id = rs.getInt(5);
- Statement s1 = conn.createStatement();
- ResultSet rs1 = s1.executeQuery("SELECT accountNumber, accountType, balance FROM accounts where id=" + id);
- stream.println("====Customers accounts");
- while (rs1.next()) {
- stream.print("\t");
- stream.print(rs1.getString(1));
- stream.print(" ");
- stream.print(rs1.getString(2));
- stream.print(" ");
- stream.print(rs1.getString(3));
- stream.println();
- }
- rs1.close();
- rs1 = s1.executeQuery("SELECT symbol, quantity, purchasePrice, purchaseDate, purchaseLotNumber FROM stocks where id=" + id);
- stream.println("====Customers Stocks");
- while (rs1.next()) {
- stream.print("\t");
- stream.print(rs1.getString(1));
- stream.print(" ");
- stream.print(rs1.getString(2));
- stream.print(" ");
- stream.print(rs1.getString(3));
- stream.print(" ");
- stream.print(rs1.getString(4));
- stream.print(" ");
- stream.print(rs1.getString(5));
- stream.println();
- }
- s1.close();
- stream.println();
-
- }
- s.close();
- conn.commit();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (conn != null) {
- conn.close();
- }
- conn = null;
- }
-
- }
-
- public static class MyDateConverter implements Converter {
-
- private static final DateFormat tsformat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-
- public Object getPropertyValue(Object columnData) {
-
- try {
- return tsformat.parse(columnData.toString());
- } catch (ParseException e) {
-
- e.printStackTrace();
- throw new IllegalArgumentException(e);
- }
-
- }
-
- public Object getColumnValue(Object propertyData) {
-
- if (propertyData instanceof Date) {
- return tsformat.format(propertyData);
- } else {
- throw new IllegalArgumentException();
- }
-
- }
-
- }
-
- /**
- * @param args
- */
- public static void main(String[] args) throws Exception {
- registerTypes();
- String dbDirectory = null; // "c:/derbydbtest/foo";
- String dasConfigFile = null;
- Boolean deleteExisting = false;
- for (String x : args) {
- if ("-d".equals(x)) {
- deleteExisting = true;
- }
- if (x.startsWith("-db:")) {
- dbDirectory = x.substring("-db:".length());
- }
- if (x.startsWith("-config:")) {
- dasConfigFile = x.substring("-config:".length());
- ;
- }
-
- }
- AccountDBInit accountDBInit = new AccountDBInit(dbDirectory, dasConfigFile, deleteExisting);
-
- createDB(dbDirectory);
-
- accountDBInit.readDBstdout(System.out);
-
- // Test withdrawl
- withdraw wd = AccountFactory.INSTANCE.createwithdraw();
- wd.setAccountNumber("134-43-3942");
- wd.setAmount(1.00F);
- accountDBInit.testWithdrawThroughDAS(wd);
-
- accountDBInit.readDBstdout(System.out);
-
- // test stock purchase.
- purchaseStock sp = AccountFactory.INSTANCE.createpurchaseStock();
- StockSummary stock = AccountFactory.INSTANCE.createStockSummary();
- stock.setSymbol("GOOG");
- stock.setQuantity(10);
- stock.setPurchasePrice(25.00F);
- sp.setId(1);
- sp.setStock(stock);
-
- accountDBInit.testStrockPurchaseThroughDAS(sp);
-
- accountDBInit.readDBstdout(System.out);
-
- System.out.flush();
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java
deleted file mode 100644
index 2360344cd1..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerDataServiceImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account.services.accountlogger;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import bigbank.account.services.accountdata.AccountDataService;
-import bigbank.account.services.accountdata.CustomerIdService;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-/**
- * This class implements the Account Data Logger service component.
- */
-@Service(AccountDataService.class)
-public class AccountLoggerDataServiceImpl implements AccountDataService {
-
- private CustomerIdService accountDataService; // TODO fix this!
-
- @Reference
- public void setAccountDataService(CustomerIdService accountDataService) {
- this.accountDataService = accountDataService;
- }
-
- private AccountLoggerService accountLoggerService;
-
- @Reference
- public void setAccountLoggerService(AccountLoggerService accountLoggerService) {
- this.accountLoggerService = accountLoggerService;
- }
-
- public StockSummary purchaseStock(int id, StockSummary stock) throws RemoteException {
- accountLoggerService.logPurchaseStock(id, stock);
-
- return accountDataService.purchaseStock(id, stock);
- }
-
- public CustomerProfileData getCustomerProfile(String logonID) throws RemoteException {
-
- return accountDataService.getCustomerProfile(logonID);
- }
-
- public float deposit(String account, float amount) throws RemoteException {
- try {
- if (!(accountDataService instanceof CustomerIdService)) {
- throw new RemoteException("Can't use data service as customer id service");
- }
- int id = accountDataService.getCustomerIdByAccount(account);
- // int id = accountDataService.getCustomerIdByAccount(account);
- accountLoggerService.logDeposit(id, account, amount);
-
- return accountDataService.deposit(account, amount);
- } catch (RemoteException e) {
- e.printStackTrace();
- throw e;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
- }
- }
-
- public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createChecking)
- throws RemoteException {
-
- return accountDataService.createAccount(customerProfile, createSavings, createChecking);
- }
-
- public StockSummary sellStock(int purchaseLotNumber, int quantity) throws RemoteException {
- try {
- int id = accountDataService.getCustomerIdByPurchaseLotNumber(purchaseLotNumber);
- StockSummary ss = accountDataService.sellStock(purchaseLotNumber, quantity);
- if (ss != null) {
- if (!(accountDataService instanceof CustomerIdService)) {
- throw new RemoteException("Can't use data service as customer id service");
- }
- accountLoggerService.logSellStock(id, ss, quantity);
- }
- return ss;
- } catch (RemoteException e) {
- e.printStackTrace();
- throw e;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass() + " " + e.getMessage(), e);
- }
- }
-
- public float withdraw(String account, float amount) throws RemoteException {
- if (!(accountDataService instanceof CustomerIdService)) {
- throw new RemoteException("Can't use data service as customer id service");
- }
- int id = accountDataService.getCustomerIdByAccount(account);
- // int id = accountDataService.getCustomerIdByAccount(account);
- accountLoggerService.logWithdrawal(id, account, amount);
-
- return accountDataService.withdraw(account, amount);
- }
-
- public AccountReport getAccountReport(final int customerID) throws RemoteException {
-
- return accountDataService.getAccountReport(customerID);
- }
-
- public AccountLog getAccountLog(final int customerID) throws RemoteException {
- return accountLoggerService.getAccountLog(customerID);
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.java
deleted file mode 100644
index b9b2821d38..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerService.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 bigbank.account.services.accountlogger;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.OneWay;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.StockSummary;
-
-/**
- * This is the business interface of the Account Logger service component.
- */
-public interface AccountLoggerService {
-
- @OneWay
- public void logDeposit(int id, String account, float amount) throws RemoteException;
-
- @OneWay
- public void logWithdrawal(int id, String account, float amount) throws RemoteException;
-
- @OneWay
- public void logPurchaseStock(int id, StockSummary stock) throws RemoteException;
-
- @OneWay
- public void logSellStock(int id, StockSummary stock, int quantity) throws RemoteException;
-
- public AccountLog getAccountLog(int id) throws RemoteException;
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
deleted file mode 100644
index 8919aad311..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account.services.accountlogger;
-
-import java.io.InputStream;
-import java.rmi.RemoteException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.Properties;
-
-import org.apache.tuscany.das.rdb.Command;
-import org.apache.tuscany.das.rdb.DAS;
-import org.osoa.sca.annotations.Service;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.StockSummary;
-import commonj.sdo.DataObject;
-
-/**
- * This class implements the Account Logger service component.
- */
-@Service(AccountLoggerService.class)
-public class AccountLoggerServiceImpl implements AccountLoggerService {
-
- public static final String ACCT_ACTION_TYPE_DEPOSIT = "deposit";
-
- public static final String ACCT_ACTION_TYPE_WITHDRAW = "withdraw";
-
- public static final String STOCK_ACTION_TYPE_PURCHASE = "purchase";
-
- public static final String STOCK_ACTION_TYPE_SELL = "sell";
-
- static public String dbDirectory = null;
-
- protected static final String driver = "org.apache.derby.jdbc.EmbeddedDriver";
-
- protected static final String protocol = "jdbc:derby:";
-
- public void logDeposit(int id, String account, float amount) throws RemoteException {
- DAS das = DAS.FACTORY.createDAS(getConnection());
- Command insert = das.createCommand("insert into acctLog (id, accountNumber, actionType, amount) values (?,?,?,?)");
- insert.setParameter(1, new Integer(id));
- insert.setParameter(2, account);
- insert.setParameter(3, ACCT_ACTION_TYPE_DEPOSIT);
- insert.setParameter(4, new Float(amount));
-
- insert.execute();
- /*
- * performLog("insert into acctLog (id, accountNumber, actionType, amount) values (" + id + ", '" + account + "', '" +
- * ACCT_ACTION_TYPE_DEPOSIT + "', " + amount + ")");
- */
- }
-
- public void logWithdrawal(int id, String account, float amount) throws RemoteException {
- DAS das = DAS.FACTORY.createDAS(getConnection());
- Command insert = das.createCommand("insert into acctLog (id, accountNumber, actionType, amount) values (?,?,?,?)");
- insert.setParameter(1, new Integer(id));
- insert.setParameter(2, account);
- insert.setParameter(3, ACCT_ACTION_TYPE_WITHDRAW);
- insert.setParameter(4, new Float(amount));
-
- insert.execute();
- /*
- * performLog("insert into acctLog (id ,accountNumber, actionType, amount) values (" + id + ", '" + account + "', '" +
- * ACCT_ACTION_TYPE_WITHDRAW + "', " + amount + ")");
- */
- }
-
- public void logPurchaseStock(int id, StockSummary stock) throws RemoteException {
- DAS das = DAS.FACTORY.createDAS(getConnection());
- Command insert = das.createCommand("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (?,?,?,?,?)");
- insert.setParameter(1, new Integer(id));
- insert.setParameter(2, stock.getSymbol());
- insert.setParameter(3, new Integer(stock.getQuantity()));
- insert.setParameter(4, STOCK_ACTION_TYPE_PURCHASE);
- insert.setParameter(5, new Integer(stock.getPurchaseLotNumber()));
-
- insert.execute();
- /*
- * performLog("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (" + id + ", '" + stock.getSymbol() + "', " +
- * stock.getQuantity() + ", '" + STOCK_ACTION_TYPE_PURCHASE + ", " + stock.getPurchaseLotNumber() + ")");
- */
- }
-
- public void logSellStock(int id, StockSummary stock, int quantity) throws RemoteException {
-
- String symbol = ((stock.getSymbol() != null) ? stock.getSymbol() : "null");
- DAS das = DAS.FACTORY.createDAS(getConnection());
- Command insert = das.createCommand("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (?,?,?,?,?)");
- insert.setParameter(1, new Integer(id));
- insert.setParameter(2, symbol);
- insert.setParameter(3, new Integer(quantity));
- insert.setParameter(4, STOCK_ACTION_TYPE_SELL);
- insert.setParameter(5, new Integer(stock.getPurchaseLotNumber()));
-
- insert.execute();
- /*
- * performLog("insert into stockLog (id, Symbol, quantity, actionType, purchaseLotNumber) values (" + id + ", '" + stock.getSymbol() + "', " +
- * quantity + ", '" + STOCK_ACTION_TYPE_SELL + ", " + stock.getPurchaseLotNumber() + ")");
- */
- }
-
- private void performLog(String toLog) throws RemoteException {
-
- try {
- Connection conn = getConnection();
-
- Statement s = conn.createStatement();
-
- s.execute(toLog);
-
- conn.commit();
-
- System.out.println("SN id acctNo action amount");
- ResultSet rs = s.executeQuery("select * from acctLog");
- while (rs.next()) {
- System.out.println(rs.getInt("logSeqNo") + " " + rs.getInt("id") + " " + rs.getString("accountNumber") + " "
- + rs.getString("actionType") + " " + rs.getFloat("amount"));
- }
-
- conn.commit();
-
- System.out.println("SN Symbol qty action plot#");
- rs = s.executeQuery("select * from stockLog");
- while (rs.next()) {
- System.out.println(rs.getInt("logSeqNo") + " " + rs.getString("Symbol") + " " + rs.getInt("quantity") + " "
- + rs.getString("actionType") + " " + rs.getInt("purchaseLotNumber"));
- }
-
- conn.commit();
-
- s.close();
-
- conn.close();
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass().getName(), e);
- }
-
- System.out.println("Logged " + toLog);
- }
-
- protected Connection getConnection() throws RemoteException {
- try {
- Connection conn;
- Class.forName(driver).newInstance();
- Properties props = new Properties();
- // props.put("user", "tuscany");
- // props.put("password", "tuscany");
- conn = DriverManager.getConnection(protocol + dbDirectory + ";create=true", props);
-
- conn.setAutoCommit(false);
- return conn;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass().getName(), e);
- }
- }
-
- public AccountLog getAccountLog(final int customerID) throws RemoteException {
-
- try {
- final AccountFactory accountFactory = AccountFactory.INSTANCE;
- final AccountLog accountLog = accountFactory.createAccountLog();
- InputStream mapping = createConfigStream();
-
- Connection conn = getConnection();
- DAS das = DAS.FACTORY.createDAS(mapping, conn);
- Command select = das.createCommand("SELECT logSeqNo, accountNumber, actionType, amount FROM acctLog where id = ?");
-
- select.setParameter(1, customerID);
-
- DataObject root = select.executeQuery();
- accountLog.getAccountLogEntries().addAll(root.getList("AccountLogEntry"));
-
- select = das.createCommand("SELECT logSeqNo, Symbol, quantity, actionType, purchaseLotNumber FROM stockLog where id = ?");
- select.setParameter(1, customerID);
- root = select.executeQuery();
- accountLog.getStockLogEntries().addAll(root.getList("StockLogEntry"));
-
- conn.close();
-
- return accountLog;
- } catch (Exception e) {
- if (e instanceof RemoteException) {
- throw (RemoteException) e;
- }
- throw new RemoteException("getAccountLog failed. customerID ('" + customerID + "')" + e.getClass().getName() + "'. " + e.getMessage(), e);
- }
- }
-
- protected InputStream createConfigStream() {
- InputStream mapping = getClass().getClassLoader().getResourceAsStream("DasAccountConfiguration.xml");
- return mapping;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java
deleted file mode 100644
index c7498f093d..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuote.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account.services.stockquote;
-
-public class StockQuote {
-
- private String companyName;
-
- private String symbol;
-
- private String stockQuote;
-
- private String lastUpdated;
-
- private String change;
-
- private String openPrice;
-
- private String dayHighPrice;
-
- private String dayLowPrice;
-
- private String volume;
-
- private String marketCap;
-
- private String yearRange;
-
- private String exDividendDate;
-
- private String dividendYield;
-
- private String dividendPerShare;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected StockQuote() {
- super();
- }
-
- public String getCompanyName() {
- return companyName;
- }
-
- public void setCompanyName(String newCompanyName) {
- companyName = newCompanyName;
- }
-
- public String getSymbol() {
- return symbol;
- }
-
- public void setSymbol(String newStockTicker) {
- symbol = newStockTicker;
- }
-
- public String getStockQuote() {
- return stockQuote;
- }
-
- public void setStockQuote(String newStockQuote) {
- stockQuote = newStockQuote;
- }
-
- public String getLastUpdated() {
- return lastUpdated;
- }
-
- public void setLastUpdated(String newLastUpdated) {
- lastUpdated = newLastUpdated;
- }
-
- public String getChange() {
- return change;
- }
-
- public void setChange(String newChange) {
- change = newChange;
- }
-
- public String getOpenPrice() {
- return openPrice;
- }
-
- public void setOpenPrice(String newOpenPrice) {
- openPrice = newOpenPrice;
- }
-
- public String getDayHighPrice() {
- return dayHighPrice;
- }
-
- public void setDayHighPrice(String newDayHighPrice) {
- dayHighPrice = newDayHighPrice;
- }
-
- public String getDayLowPrice() {
- return dayLowPrice;
- }
-
- public void setDayLowPrice(String newDayLowPrice) {
- dayLowPrice = newDayLowPrice;
- }
-
- public String getVolume() {
- return volume;
- }
-
- public void setVolume(String newVolume) {
- volume = newVolume;
- }
-
- public String getMarketCap() {
- return marketCap;
- }
-
- public void setMarketCap(String newMarketCap) {
- marketCap = newMarketCap;
- }
-
- public String getYearRange() {
- return yearRange;
- }
-
- public void setYearRange(String newYearRange) {
- yearRange = newYearRange;
- }
-
- public String getExDividendDate() {
- return exDividendDate;
- }
-
- public void setExDividendDate(String newExDividendDate) {
- exDividendDate = newExDividendDate;
- }
-
- public String getDividendYield() {
- return dividendYield;
- }
-
- public void setDividendYield(String newDividendYield) {
- dividendYield = newDividendYield;
- }
-
- public String getDividendPerShare() {
- return dividendPerShare;
- }
-
- public void setDividendPerShare(String newDividendPerShare) {
- dividendPerShare = newDividendPerShare;
- }
-
- @Override
- public String toString() {
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (companyName: ");
- result.append(companyName);
- result.append(", symbol: ");
- result.append(symbol);
- result.append(", stockQuote: ");
- result.append(stockQuote);
- result.append(", lastUpdated: ");
- result.append(lastUpdated);
- result.append(", change: ");
- result.append(change);
- result.append(", openPrice: ");
- result.append(openPrice);
- result.append(", dayHighPrice: ");
- result.append(dayHighPrice);
- result.append(", dayLowPrice: ");
- result.append(dayLowPrice);
- result.append(", volume: ");
- result.append(volume);
- result.append(", marketCap: ");
- result.append(marketCap);
- result.append(", yearRange: ");
- result.append(yearRange);
- result.append(", exDividendDate: ");
- result.append(exDividendDate);
- result.append(", dividendYield: ");
- result.append(dividendYield);
- result.append(", dividendPerShare: ");
- result.append(dividendPerShare);
- result.append(')');
- return result.toString();
- }
-
- @Override
- public StockQuote clone() {
- StockQuote ret = new StockQuote();
- ret.companyName = companyName;
- ret.symbol = symbol;
- ret.stockQuote = stockQuote;
- ret.lastUpdated = lastUpdated;
- ret.change = change;
- ret.openPrice = openPrice;
- ret.dayHighPrice = dayHighPrice;
- ret.dayLowPrice = dayLowPrice;
- ret.volume = volume;
- ret.marketCap = marketCap;
- ret.yearRange = yearRange;
- ret.exDividendDate = exDividendDate;
- ret.dividendYield = dividendYield;
- ret.dividendPerShare = dividendPerShare;
- return ret;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.java
deleted file mode 100644
index 9d5c243f9a..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteService.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 bigbank.account.services.stockquote;
-
-import java.rmi.RemoteException;
-import java.util.Map;
-
-/**
- * This is the business interface of the HelloWorld service component.
- */
-public interface StockQuoteService {
-
- public Map getQuotes(String[] symbols) throws RemoteException;
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java
deleted file mode 100644
index b0c31d4d81..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account.services.stockquote;
-
-import java.rmi.RemoteException;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Random;
-
-/* Mock StockQuoteService */
-
-public class StockQuoteServiceImpl implements StockQuoteService {
-
- static Random rn = new Random();
-
- static Hashtable<String, StockQuote> stocks = new Hashtable<String, StockQuote>();
-
- public synchronized Map getQuotes(String[] symbols) throws RemoteException {
- Map<String, StockQuote> ret = new Hashtable<String, StockQuote>();
- for (String sym : symbols) {
- sym = sym.toUpperCase();
- if (!ret.containsKey(sym)) {
- StockQuote sq = stocks.get(sym);
- if (sq == null) {
- sq = new StockQuote();
- stocks.put(sym, sq);
- sq.setSymbol(sym);
- sq.setCompanyName(sym + " INC");
- float val = rn.nextFloat() * 97.0F + 3.0F;
- sq.setStockQuote(val + "");
- sq.setDayHighPrice(val + "");
- sq.setDayLowPrice(val + "");
- sq.setOpenPrice(val + "");
- } else {
- float diff = (rn.nextFloat() * 2.0F) - 1;
- float newval = new Float(sq.getStockQuote()) + diff; // auto boxing cool.
- sq.setStockQuote(newval + "");
- float dh = Math.max(newval, new Float(sq.getDayHighPrice()));
- sq.setDayHighPrice(dh + "");
- float dl = Math.min(newval, new Float(sq.getDayLowPrice()));
- sq.setDayLowPrice(dl + "");
-
- }
- ret.put(sym, sq.clone());
- }
-
- }
-
- return ret;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
deleted file mode 100644
index 053f9d7f16..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/java/bigbank/account/services/stockquote/StockQuoteWebservicexServiceImpl.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account.services.stockquote;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-import net.x.webservice.StockQuoteSoap;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the Stock quote service component.
- */
-@Service(StockQuoteService.class)
-@Scope("COMPOSITE")
-public class StockQuoteWebservicexServiceImpl implements StockQuoteService {
-
- @Reference
- public StockQuoteSoap stockQuoteService = null; // Injected by the SCA container.
-
- /**
- * @throws RemoteException
- * @see bigbank.account.services.stockquote.StockQuoteService#getQuotes(String[])
- */
- public Map getQuotes(final String[] symbols) throws RemoteException {
- try {
- assert null != stockQuoteService : "stockQuoteService was not set by the SCA runtime!";
- StringBuilder sb = new StringBuilder(5 * symbols.length);
- for (String sym : symbols) {
- if (sb.length() != 0) {
- sb.append(' ');
- }
- sb.append(sym);
- }
- String stockdata = stockQuoteService.GetQuote(sb.toString());
-
- InputStream in = new ByteArrayInputStream(stockdata.getBytes());
- XMLInputFactory factory = XMLInputFactory.newInstance();
- XMLStreamReader parser = factory.createXMLStreamReader(in);
- ArrayList<StockQuote> listQuotes = new ArrayList<StockQuote>();
- Hashtable<String, StockQuote> listQuoteHT = new Hashtable<String, StockQuote>();
- MapStock currentStock = null;
- StringBuilder currentText = new StringBuilder(100);
- for (int event = parser.next(); event != XMLStreamConstants.END_DOCUMENT; event = parser.next()) {
- String lname;
- switch (event) {
- case XMLStreamConstants.START_ELEMENT:
- if (parser.getLocalName() == "Stock") {
-
- currentStock = new MapStock();
- listQuotes.add(currentStock);
- }
- break;
- case XMLStreamConstants.END_ELEMENT:
- lname = parser.getLocalName();
- String mname = "set" + lname;
- try {
- Method setter = MapStock.class.getMethod(mname, new Class[] { String.class });
- if (setter != null) {
- setter.invoke(currentStock, currentText.toString());
- if (lname.equals("Symbol")) {
- listQuoteHT.put(currentText.toString(), currentStock);
-
- }
- }
- } catch (NoSuchMethodException e) {
-
- }
- // System.err.println(parser.getLocalName() + ":" + currentText.toString());
- currentText.setLength(0);
- break;
- case XMLStreamConstants.CHARACTERS:
- // System.out.print(parser.getText());
- currentText.append(parser.getText());
- break;
- case XMLStreamConstants.CDATA:
- // System.out.print(parser.getText());
- currentText.append(parser.getText());
- break;
- } // end switch
- } // end while
- parser.close();
-
- return listQuoteHT;
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getClass().getName() + e.getMessage(), e);
- }
- }
-
- public static class MapStock extends StockQuote {
-
- public void setLast(String val) {
- super.setStockQuote(val);
- }
-
- public void setDate(String val) {
- };
-
- public void setTime(String val) {
- };
-
- public void setHigh(String val) {
- super.setDayHighPrice(val);
- }
-
- public void setLow(String val) {
- super.setDayLowPrice(val);
- }
-
- public void setOpen(String val) {
- super.setOpenPrice(val);
- }
-
- public void setMktCap(String val) {
- super.setMarketCap(val);
- }
-
- public void setName(String val) {
- super.setCompanyName(val);
- }
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/DasAccountConfiguration.xml b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/DasAccountConfiguration.xml
deleted file mode 100644
index ed1553eb40..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/DasAccountConfiguration.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<Config xmlns="http:///org.apache.tuscany.das.rdb/config.xsd" dataObjectModel="http://www.bigbank.com/account">
-
- <Table tableName="CUSTOMERS" typeName="CustomerProfileData">
- <!-- Column name="firstName" primaryKey="true"/ -->
- <Column columnName="FIRSTNAME"/>
- <Column columnName="LASTNAME"/>
- <Column columnName="ADDRESS"/>
- <Column columnName="EMAIL"/>
- <Column columnName="LOGINID"/>
- <Column columnName="PASSWORD"/>
- <Column columnName="ID"/>
- </Table>
-
- <Table tableName="ACCOUNTS" typeName="AccountSummary">
- <!-- Column name="firstName" primaryKey="true"/ -->
- <Column columnName="ACCOUNTNUMBER"/>
- <Column columnName="BALANCE"/>
- </Table>
-
-
-
- <Table tableName="STOCKS" typeName="StockSummary" >
- <Column columnName="ID" propertyName="id"/>
- <Column columnName="Symbol" propertyName="symbol"/>
- <Column columnName="quantity" propertyName="quantity"/>
- <Column columnName="purchasePrice" propertyName="purchasePrice"/>
- <Column columnName="PURCHASEDATE" propertyName="purchaseDate" converterClassName="bigbank.account.services.accountdata.AccountDataServiceDASImpl$DateConverter"/>
- </Table>
-
-
- <Table tableName="ACCTLOG" typeName="AccountLogEntry">
- <Column columnName="logSeqNo"/>
- <Column columnName="ID"/>
- <Column columnName="ACCOUNTNUMBER"/>
- <Column columnName="ACTIONTYPE"/>
- <Column columnName="AMOUNT"/>
- </Table>
-
-
-
- <Table tableName="STOCKLOG" typeName="StockLogEntry" >
- <Column columnName="logSeqNo"/>
- <Column columnName="ID"/>
- <Column columnName="Symbol"/>
- <Column columnName="quantity"/>
- <Column columnName="actionType"/>
- <Column columnName="purchaseLotNumber"/>
- </Table>
-
-
- <Command name="get account" SQL="SELECT accountNumber, accountType, balance FROM accounts where accountNumber = ?" kind="Select" />
- <Command name="update balance" SQL="update ACCOUNTS set BALANCE = ? where ACCOUNTNUMBER = ?" kind="Update" />
-
- <Command name="all customers" SQL="select * from CUSTOMERS" kind="Select"/>
-
- <Command name="all stocks" SQL="select symbol, quantity, purchaseprice, purchasedate from stocks" kind="Select"/>
- <Command name="stockbylotSelect" SQL="select quantity from STOCKS WHERE purchaseLotNumber = ?" kind="Select" />
- <Command name="stockbylot" SQL="update STOCKS set quantity = ? WHERE purchaseLotNumber = ?" kind="Update" />
-
-</Config>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/AccountService.wsdl b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index 5e8ced28e0..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:account="http://www.bigbank.com/account"
- targetNamespace="http://www.bigbank.com/account"
- name="AccountService">
-
- <wsdl:types>
- <xsd:schema targetNamespace="http://www.bigbank.com/account"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:account="http://www.bigbank.com/account"
-
- > <!-- xmlns:sdojava="commonj.sdo/java" sdojava:package="org.apache.tuscany.samples.bigbank.account" -->
-
-
-<!-- <xsd:complexType name="DataGraphRoot">
- <xsd:sequence>
- <xsd:element name="customerProfileData" type="account:CustomerProfileData" maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="StockSummaries" type="account:StockSummary" maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="AccountSummaries" type="account:AccountSummary" maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="StockLogEntries" type="account:StockLogEntry" maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="AccountLogEntries" type="account:AccountLogEntry" maxOccurs="unbounded" minOccurs="0" />
- </xsd:sequence>
- </xsd:complexType>-->
-
-
- <xsd:element name="getAccountReport">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="customerID"
- type="xsd:int" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="getAccountReportResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="accountReport"
- type="account:AccountReport" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="AccountReport">
- <xsd:sequence>
- <xsd:element name="accountSummaries"
- type="account:AccountSummary" maxOccurs="unbounded" />
- <xsd:element name="stockSummaries"
- type="account:StockSummary" maxOccurs="unbounded" />
-
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="AccountSummary">
- <xsd:attribute name="accountNumber" type="xsd:string" />
- <xsd:attribute name="accountType" type="xsd:string" />
- <xsd:attribute name="balance" type="xsd:float" />
- </xsd:complexType>
-
- <xsd:complexType name="StockSummary">
- <!-- xsd:attribute name="id" type="xsd:int" / -->
- <xsd:attribute name="purchaseLotNumber" type="xsd:int" />
- <!-- unique id for this purchase -->
- <xsd:attribute name="symbol" type="xsd:string" />
- <xsd:attribute name="quantity" type="xsd:int" />
- <xsd:attribute name="purchaseDate" type="xsd:dateTime" />
- <xsd:attribute name="purchasePrice" type="xsd:float" />
- <xsd:attribute name="currentPrice" type="xsd:float" />
- <xsd:attribute name="company" type="xsd:string" />
- <xsd:attribute name="highPrice" type="xsd:float" />
- <xsd:attribute name="lowPrice" type="xsd:float" />
-
- </xsd:complexType>
-
- <!-- Profile in data base -->
- <xsd:element name="getCustomerProfile">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="loginID" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="CustomerProfileData">
- <xsd:sequence>
- <xsd:element name="firstName" type="xsd:string" />
- <xsd:element name="lastName" type="xsd:string" />
- <xsd:element name="address" type="xsd:string" />
- <xsd:element name="email" type="xsd:string" />
- <xsd:element name="loginID" type="xsd:string" />
- <xsd:element name="password" type="xsd:string" />
- <xsd:element name="id" type="xsd:int" />
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="getCustomerProfileResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="customerProfile"
- type="account:CustomerProfileData" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="withdraw">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="accountNumber"
- type="xsd:string" />
- <xsd:element name="amount" type="xsd:float" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="withdrawResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="balance" type="xsd:float" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="deposit">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="accountNumber"
- type="xsd:string" />
- <xsd:element name="amount" type="xsd:float" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="depositResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="balance" type="xsd:float" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="purchaseStock">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="id" type="xsd:int" />
- <xsd:element name="stock" type="account:StockSummary" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="purchaseStockResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="purchaseSummary"
- type="account:StockSummary" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
-
-
- <xsd:element name="sellStock">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="purchaseLotNumber"
- type="xsd:int" /><!-- unique id for this purchase -->
- <xsd:element name="quantity" type="xsd:int" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="createAccount">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="customerProfile"
- type="account:CustomerProfileData" />
- <xsd:element name="createSavings"
- type="xsd:boolean" />
- <xsd:element name="createCheckings"
- type="xsd:boolean" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="createAccountResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="customerProfile"
- type="account:CustomerProfileData" />
- </xsd:sequence>
- </xsd:complexType>
-
- </xsd:element>
-
- <xsd:element name="getAccountLog">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="customerID"
- type="xsd:int" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="getAccountLogResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="accountLog"
- type="account:AccountLog" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="AccountLog">
- <xsd:sequence>
- <xsd:element name="accountLogEntries"
- type="account:AccountLogEntry" maxOccurs="unbounded" />
- <xsd:element name="stockLogEntries"
- type="account:StockLogEntry" maxOccurs="unbounded" />
-
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="AccountLogEntry">
- <xsd:attribute name="logSeqNo" type="xsd:int" />
- <xsd:attribute name="id" type="xsd:int" />
- <xsd:attribute name="accountNumber" type="xsd:string" />
- <xsd:attribute name="actionType" type="xsd:string" />
- <xsd:attribute name="amount" type="xsd:float" />
- </xsd:complexType>
-
- <xsd:complexType name="StockLogEntry">
- <xsd:attribute name="logSeqNo" type="xsd:int" />
- <xsd:attribute name="id" type="xsd:int" />
- <xsd:attribute name="symbol" type="xsd:string" />
- <xsd:attribute name="quantity" type="xsd:int" />
- <xsd:attribute name="actionType" type="xsd:string" />
- <xsd:attribute name="purchaseLotNumber" type="xsd:int" />
- </xsd:complexType>
-
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="getAccountReportRequest">
- <wsdl:part element="account:getAccountReport"
- name="getAccountReportRequest" />
- </wsdl:message>
- <wsdl:message name="getAccountReportResponse">
- <wsdl:part element="account:getAccountReportResponse"
- name="getAccountReportResponse" />
- </wsdl:message>
-
- <wsdl:message name="getCustomerProfileRequest">
- <wsdl:part element="account:getCustomerProfile"
- name="getCustomerProfile" />
- </wsdl:message>
- <wsdl:message name="getCustomerProfileResponse">
- <wsdl:part element="account:getCustomerProfileResponse"
- name="getCustomerProfileResponse" />
- </wsdl:message>
-
- <wsdl:message name="withdrawRequest">
- <wsdl:part element="account:withdraw" name="withdrawRequest" />
- </wsdl:message>
-
- <wsdl:message name="withdrawResponse">
- <wsdl:part element="account:withdrawResponse"
- name="withdrawResponse" />
- </wsdl:message>
-
- <wsdl:message name="depositRequest">
- <wsdl:part element="account:deposit" name="depositRequest" />
- </wsdl:message>
-
- <wsdl:message name="depositResponse">
- <wsdl:part element="account:depositResponse"
- name="depositResponse" />
- </wsdl:message>
-
- <wsdl:message name="purchaseStockRequest">
- <wsdl:part element="account:purchaseStock"
- name="purchaseStockRequest" />
- </wsdl:message>
-
- <wsdl:message name="purchaseStockResponse">
- <wsdl:part element="account:purchaseStockResponse"
- name="purchaseStockResponse" />
- </wsdl:message>
-
- <wsdl:message name="sellStockRequest">
- <wsdl:part element="account:sellStock" name="sellStockRequest" />
- </wsdl:message>
-
- <wsdl:message name="createAccountRequest">
- <wsdl:part element="account:createAccount" name="createAccountRequest" />
- </wsdl:message>
-
- <wsdl:message name="createAccountResponse">
- <wsdl:part element="account:createAccountResponse" name="createAccountResponse" />
- </wsdl:message>
-
- <wsdl:message name="getAccountLogRequest">
- <wsdl:part element="account:getAccountLog"
- name="getAccountLogRequest" />
- </wsdl:message>
-
- <wsdl:message name="getAccountLogResponse">
- <wsdl:part element="account:getAccountLogResponse"
- name="getAccountLogResponse" />
- </wsdl:message>
-
- <wsdl:portType name="AccountService">
- <wsdl:operation name="getAccountReport">
- <wsdl:input message="account:getAccountReportRequest" />
- <wsdl:output message="account:getAccountReportResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="getCustomerProfile">
- <wsdl:input message="account:getCustomerProfileRequest" />
- <wsdl:output message="account:getCustomerProfileResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="withdraw">
- <wsdl:input message="account:withdrawRequest" />
- <wsdl:output message="account:withdrawResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="deposit">
- <wsdl:input message="account:depositRequest" />
- <wsdl:output message="account:depositResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="purchaseStock">
- <wsdl:input message="account:purchaseStockRequest" />
- <wsdl:output message="account:purchaseStockResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="sellStock">
- <wsdl:input message="account:sellStockRequest" />
- <wsdl:output message="account:purchaseStockResponse" />
- </wsdl:operation>
-
-
- <wsdl:operation name="createAccount">
- <wsdl:input message="account:createAccountRequest" />
- <wsdl:output message="account:createAccountResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="getAccountLog">
- <wsdl:input message="account:getAccountLogRequest" />
- <wsdl:output message="account:getAccountLogResponse" />
- </wsdl:operation>
-
- </wsdl:portType>
-
-
-
- <wsdl:binding name="AccountServiceSOAP" type="account:AccountService">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="getAccountReport">
- <soap:operation
- soapAction="http://www.bigbank.com/account/getAccountReport" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getCustomerProfile">
- <soap:operation
- soapAction="http://www.bigbank.com/account/getCustomerProfile" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="withdraw">
- <soap:operation
- soapAction="http://www.bigbank.com/account/withdraw" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="deposit">
- <soap:operation
- soapAction="http://www.bigbank.com/account/deposit" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="purchaseStock">
- <soap:operation
- soapAction="http://www.bigbank.com/account/purchaseStock" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="sellStock">
- <soap:operation
- soapAction="http://www.bigbank.com/account/sellStock" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="createAccount">
- <soap:operation
- soapAction="http://www.bigbank.com/account/createAccount" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="getAccountLog">
- <soap:operation
- soapAction="http://www.bigbank.com/account/getAccountLog" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:binding>
- <wsdl:service name="AccountService">
- <wsdl:port binding="account:AccountServiceSOAP"
- name="AccountServiceSOAP">
- <soap:address
- location="http://localhost:8085/sample-bigbank-account/services/AccountService" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl
deleted file mode 100644
index 16c980a30e..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/resources/wsdl/stockquotes.webservicex.wsdl
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<wsdl:definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.webserviceX.NET/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://www.webserviceX.NET/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:types>
- <s:schema elementFormDefault="qualified"
- targetNamespace="http://www.webserviceX.NET/" >
- <!--
- xmlns:sdojava="commonj.sdo/java"
- sdojava:package="net.x.webservice"
- -->
-
-
- >
- <s:element name="GetQuote">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="symbol" type="s:string"/>
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="GetQuoteResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="GetQuoteResult" type="s:string"/>
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="string" nillable="true" type="s:string"/>
- </s:schema>
- </wsdl:types>
- <wsdl:message name="GetQuoteSoapIn">
- <wsdl:part name="parameters" element="tns:GetQuote"/>
- </wsdl:message>
- <wsdl:message name="GetQuoteSoapOut">
- <wsdl:part name="parameters" element="tns:GetQuoteResponse"/>
- </wsdl:message>
- <wsdl:message name="GetQuoteHttpGetIn">
- <wsdl:part name="symbol" type="s:string"/>
- </wsdl:message>
- <wsdl:message name="GetQuoteHttpGetOut">
- <wsdl:part name="Body" element="tns:string"/>
- </wsdl:message>
- <wsdl:message name="GetQuoteHttpPostIn">
- <wsdl:part name="symbol" type="s:string"/>
- </wsdl:message>
- <wsdl:message name="GetQuoteHttpPostOut">
- <wsdl:part name="Body" element="tns:string"/>
- </wsdl:message>
- <wsdl:portType name="StockQuoteSoap">
- <wsdl:operation name="GetQuote">
- <documentation xmlns="http://schemas.xmlsoap.org/wsdl/">Get Stock quote for a company Symbol</documentation>
- <wsdl:input message="tns:GetQuoteSoapIn"/>
- <wsdl:output message="tns:GetQuoteSoapOut"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:portType name="StockQuoteHttpGet">
- <wsdl:operation name="GetQuote">
- <documentation xmlns="http://schemas.xmlsoap.org/wsdl/">Get Stock quote for a company Symbol</documentation>
- <wsdl:input message="tns:GetQuoteHttpGetIn"/>
- <wsdl:output message="tns:GetQuoteHttpGetOut"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:portType name="StockQuoteHttpPost">
- <wsdl:operation name="GetQuote">
- <documentation xmlns="http://schemas.xmlsoap.org/wsdl/">Get Stock quote for a company Symbol</documentation>
- <wsdl:input message="tns:GetQuoteHttpPostIn"/>
- <wsdl:output message="tns:GetQuoteHttpPostOut"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="StockQuoteSoap" type="tns:StockQuoteSoap">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <wsdl:operation name="GetQuote">
- <soap:operation soapAction="http://www.webserviceX.NET/GetQuote" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:binding name="StockQuoteHttpGet" type="tns:StockQuoteHttpGet">
- <http:binding verb="GET"/>
- <wsdl:operation name="GetQuote">
- <http:operation location="/GetQuote"/>
- <wsdl:input>
- <http:urlEncoded/>
- </wsdl:input>
- <wsdl:output>
- <mime:mimeXml part="Body"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="StockQuoteHttpPost" type="tns:StockQuoteHttpPost">
- <http:binding verb="POST"/>
- <wsdl:operation name="GetQuote">
- <http:operation location="/GetQuote"/>
- <wsdl:input>
- <mime:content type="application/x-www-form-urlencoded"/>
- </wsdl:input>
- <wsdl:output>
- <mime:mimeXml part="Body"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="StockQuote">
- <wsdl:port name="StockQuoteSoap" binding="tns:StockQuoteSoap">
- <soap:address location="http://www.webservicex.com/stockquote.asmx"/>
- </wsdl:port>
- <wsdl:port name="StockQuoteHttpGet" binding="tns:StockQuoteHttpGet">
- <http:address location="http://www.webservicex.com/stockquote.asmx"/>
- </wsdl:port>
- <wsdl:port name="StockQuoteHttpPost" binding="tns:StockQuoteHttpPost">
- <http:address location="http://www.webservicex.com/stockquote.asmx"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/default.scdl b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/default.scdl
deleted file mode 100644
index 7c83a1a648..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/default.scdl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="bigbank.account">
-
-
- <service name="AccountService">
- <!-- interface.java interface="com.bigbank.account.AccountService"/-->
- <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"
- wsdli:wsdlLocation="http://www.bigbank.com/account wsdl/AccountService.wsdl" />
-
-
- <binding.ws endpoint="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
- conformanceURIs="http://ws-i.org/profiles/basic/1.1" location="wsdl/AccountService.wsdl" />
-
- <reference>AccountServiceComponent</reference>
- </service>
-
-
- <property name="currency" type="xsd:string">USD</property>
-
- <component name="AccountServiceComponent">
- <implementation.java class="bigbank.account.services.account.AccountServiceImpl" />
- <property name="currency" source="$currency" />
- <reference name="accountDataService">AccountLoggerDataServiceComponent</reference>
- <reference name="stockQuoteService">StockQuoteServiceComponent</reference>
- </component>
-
- <component name="AccountLoggerDataServiceComponent">
- <implementation.java class="bigbank.account.services.accountlogger.AccountLoggerDataServiceImpl" />
- <reference name="accountDataService">AccountDataServiceComponent</reference>
- <reference name="accountLoggerService">AccountLoggerServiceComponent</reference>
- </component>
-
- <component name="AccountDataServiceComponent">
- <implementation.java class="bigbank.account.services.accountdata.AccountDataServiceDASImpl" />
- </component>
-
- <component name="AccountLoggerServiceComponent">
- <implementation.java class="bigbank.account.services.accountlogger.AccountLoggerServiceImpl" />
- </component>
-
- <!-- by default, we use the faked stock quote implemented as a POJO component -->
- <component name="StockQuoteServiceComponent">
- <implementation.java class="bigbank.account.services.stockquote.StockQuoteServiceImpl" />
- </component>
-
- <!-- Please uncomment the following to get the real stock quote -->
- <!--
- <component name="StockQuoteServiceComponent">
- <implementation.java class="bigbank.account.services.stockquote.StockQuoteWebservicexServiceImpl" />
- <reference name="stockQuoteService">StockQuoteWebService</reference>
- </component>
-
- <reference name="StockQuoteWebService">
- <interface.wsdl interface="http://www.webserviceX.NET/#wsdl.interface(StockQuoteSoap)"
- wsdli:wsdlLocation="http://www.webserviceX.NET/ wsdl/stockquotes.webservicex.wsdl" />
- <binding.ws endpoint="http://www.webserviceX.NET/#wsdl.endpoint(StockQuote/StockQuoteSoap)"
- location="wsdl/stockquotes.webservicex.wsdl" />
- </reference>
- -->
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 509e5a052d..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <display-name>Tuscany Bigbank Account sample</display-name>
-
- <!-- context-param>
- <param-name>tuscany.systemScdlPath</param-name>
- <param-value>/META-INF/tuscany/webapp.scdl</param-value>
- </context-param -->
-
- <!-- context-param>
- <param-name>tuscany.applicationScdlPath</param-name>
- <param-value>/META-INF/sca/default.scdl</param-value>
- </context-param -->
-
- <context-param>
- <param-name>tuscany.online</param-name>
- <param-value>false</param-value>
- </context-param>
-
-
- <listener>
- <listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>TuscanyServlet</servlet-name>
- <display-name>Tuscany Servlet</display-name>
- <servlet-class>org.apache.tuscany.runtime.webapp.TuscanyServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TuscanyServlet</servlet-name>
- <url-pattern>/*</url-pattern>
-
- </servlet-mapping>
- <servlet>
- <!-- Initialize bigbank database -->
- <servlet-name>AccountDBInit</servlet-name>
- <servlet-class>bigbank.account.services.accountdb.AccountDBInit</servlet-class>
- <load-on-startup>2</load-on-startup>
- </servlet>
- <!-- servlet-mapping>
- <servlet-name>AccountDBInit</servlet-name>
- <url-pattern>/AccountDBInit</url-pattern>
- </servlet-mapping -->
-
-
-</web-app>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java b/branches/sca-java-0.99/samples/old/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java
deleted file mode 100644
index 28f9e762f0..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/account/src/test/java/bigbank/account/client/AccountClient.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account.client;
-
-import java.util.Iterator;
-
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountService;
-import com.bigbank.account.AccountSummary;
-
-public class AccountClient {
-
- public void start() {
- }
-
- public void stop() {
- }
-
- public static void main(String[] args) throws Exception {
-
- CompositeContext context = CurrentCompositeContext.getContext();
-
- AccountService accountService = context.locateService(AccountService.class, "AccountServiceComponent");
-
- AccountReport accountReport = accountService.getAccountReport(12345);
-
- for (Iterator i = accountReport.getAccountSummaries().iterator(); i.hasNext();) {
- AccountSummary accountSummary = (AccountSummary) i.next();
-
- System.out.println(accountSummary.getAccountNumber());
- System.out.println(accountSummary.getAccountType());
- System.out.println(accountSummary.getBalance());
- }
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/Show.Image.html b/branches/sca-java-0.99/samples/old/bigbank/docs/Show.Image.html
deleted file mode 100644
index 9b18679abf..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/Show.Image.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<html>
- <head>
- <style type="text/css">
- #image {
- text-align:center;
- }
- #close {
- text-align:center;
- }
- </style>
- </head>
- <body>
- <div id="image">
- <script language="javascript">
- var search = document.location.search;
- var url = search.substring(5,search.length);
- document.write("<img src='" + url + "' alt='" + url + "'/>");
- </script>
- </div>
- <div id="close"><a href="javascript:window.close()">Close Window</a></div>
- </body>
-</html>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/accountfiles.png b/branches/sca-java-0.99/samples/old/bigbank/docs/accountfiles.png
deleted file mode 100644
index 9fc46488a0..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/accountfiles.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/accountmodule.png b/branches/sca-java-0.99/samples/old/bigbank/docs/accountmodule.png
deleted file mode 100644
index d4209a01e3..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/accountmodule.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/modualoverview.png b/branches/sca-java-0.99/samples/old/bigbank/docs/modualoverview.png
deleted file mode 100644
index 7e6d7ba25e..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/modualoverview.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/webclientfiles.png b/branches/sca-java-0.99/samples/old/bigbank/docs/webclientfiles.png
deleted file mode 100644
index b951ed2e5e..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/webclientfiles.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/old/bigbank/docs/webclientmodule.png b/branches/sca-java-0.99/samples/old/bigbank/docs/webclientmodule.png
deleted file mode 100644
index dfd3a34bfb..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/docs/webclientmodule.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/old/bigbank/pom.xml b/branches/sca-java-0.99/samples/old/bigbank/pom.xml
deleted file mode 100644
index b69e5dd06a..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <parent>
- <groupId>org.apache.tuscany.sampleapps</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.samples.bigbank</groupId>
- <artifactId>bigbank-scenario</artifactId>
- <packaging>pom</packaging>
- <name>Tuscany BigBank Scenario Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <modules>
- <module>account</module>
- <module>webclient</module>
- </modules>
-</project>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/readme.html b/branches/sca-java-0.99/samples/old/bigbank/readme.html
deleted file mode 100644
index b5e90bb08f..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/readme.html
+++ /dev/null
@@ -1,894 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<html>
-<head>
-<script type="text/javascript">
-function expandImage(img,height,width) {
-window.open(img,"Image","menubar=no,resizable=no,status=no,toolbar=no,location=no,height=" + height + ",width=" + width);
-}
-function goURL(url) {
-window.location = url;
-}
-</script>
- <meta http-equiv="Content-Type" content=
- "text/html; charset=us-ascii">
- <meta http-equiv="Content-Style-Type" content="text/css">
-
- <title>Tuscany BigBank Sample Application</title>
- <link rel="stylesheet" href="../../css/base.css" type="text/css">
-<style type="text/css" media="all">
-</style>
-</head>
-
-<body>
-
- <h3>Tuscany BigBank Sample Application</h3>
-
- <h4>Overview</h4>
-
- <p>The Tuscany BigBank&nbsp;sample application&nbsp; shows using
- the Tuscany SCA runtime to build a&nbsp; financial application.
- There are two modules: webclient provides the front-end user
- interface and account provides the back-end business services.
- These are deployed as separate web applications</p>
-
- <h4>Location</h4>
- <p>This sample is located&nbsp;in the&nbsp;
- <a href=".">samples\applications\bigbank</a> directory. There are two
- subdirectories in that for the two modules <a href="account"
- target="_blank">account</a> and <a href="webclient" target=
- "_blank">webclient.</a></p>
-
-
- <h4>Prerequisites</h4>
-
- <p>Obtain the following prerequisites and install according to
- their documentation.</p>
-
- <ul>
- <li><a href="http://java.sun.com/javase/downloads/index.jsp"
- target="_blank">JDK 5.0</a></li>
-
- <li><a href="http://maven.apache.org/download.html" target=
- "_blank">Maven 2.0.4</a></li>
-
- <li><a href="http://tomcat.apache.org/download-55.cgi" target=
- "_blank">Apache Tomcat 5.xx</a> latest version binary core
- distribution.&nbsp;</li>
- </ul>
-
- <h4><a name="Building" id="Building"></a>Building</h4>
- <p>This sample
- can be built from the bigbank directory using Maven 2.0.4 with
- the following command:</p>
- <p>
- <code>&nbsp;mvn<br></code>
- </p>
-
- <h4>Setup</h4>
- <p>If you have enabled remote deployment in Tomcat by
- adding the line:<br>
- <code>&nbsp; &lt;user username="admin" password=""
- roles="manager"/&gt;</code><br>
- into&nbsp; <span style="font-style: italic;">&lt;tomcat
- dir&gt;</span>\conf\tomcat-users.xml&nbsp; you can deploy the
- WARs to Tomcat using the tomcat-maven-plugin:<br>
- <code>mvn tomcat:deploy</code></p>
- <p>Alternatively you can copy the WAR files to Tomcat's&nbsp;
- webapps directory.<br>
-
- <code>copy account\target\sample-bigbank-account.war <span style=
- "font-style: italic;">&lt;tomcat dir&gt;</span>\webapps</code><br>
- <code>copy&nbsp;
- webclient\target\sample-bigbank-webclient.war&nbsp;<span style=
- "font-style: italic;">&lt;tomcat dir&gt;</span>\webapps</code><br>
- </p>
-
- <h4>Running</h4>
- <p>Once you've started your web server, use your web
- browser to view the following URL <a href=
- "http://localhost:8080/sample-bigbank-webclient/" target=
- "_blank">http://localhost:8080/sample-bigbank-webclient/</a><br>
- You can either use an already pre configured&nbsp; account with
- <span style="font-weight: bold;">Login</span> as <span style=
- "color: rgb(204, 0, 0); font-weight: bold;">test</span> and
- <span style="font-weight: bold;">Password</span> as <span style=
- "color: rgb(204, 0, 0); font-weight: bold;">password,</span> or
- you can &nbsp;create a new account.<br>
- The demo is first configured to use a local mock stock quote
- service that returns random stock data. &nbsp;If you want to use
- an actual stock quote provider follow these steps:</p>
-
- <ul>
- <li>Stop your server by issuing in the&nbsp; <span style=
- "font-style: italic;">&lt;tomcat dir&gt;</span><span style=
- "font-weight: bold;">\bin</span> directory</li>
-
- <li>Issue <span style="font-weight: bold;">shutdown</span>
- command to stop your web application server<span style=
- "font-weight: bold;">.</span></li>
-
- <li>Edit the account SCDL file <span style=
- "font-style: italic;">&lt;tomcat dir&gt;</span><span style=
- "font-weight: bold;">\webapps\sample-bigbank-account\WEB-INF\default.scdl</span></li>
-
- <li>Change the SCDL wiring to remove the mock stock quote
- service by commenting it out as follows:<br>
- &lt;!--<br>
- &nbsp;&nbsp;&nbsp; &lt;component
- name="StockQuoteServiceComponent"&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- &lt;implementation.java
- class="bigbank.account.services.stockquote.StockQuoteServiceImpl"
- /&gt;<br>
- &nbsp;&nbsp;&nbsp; &lt;/component&gt;<br>
- --&gt;</li>
-
- <li>Uncomment the real stockquote service section in lines 68
- to 80.<br></li>
-
- <li>Change to the directory &nbsp;<span style=
- "font-weight: bold;">apache-tomcat-5.5.17\bin&nbsp;</span></li>
-
- <li>issue <span style="font-weight: bold;">startup
- &nbsp;</span> command to start up the server in the
- <span style="font-style: italic;">&lt;tomcat dir&gt;</span>\bin
- directory<span style="font-weight: bold;">.</span></li>
- </ul>
- <p>The sample should now be using the real stock quote
- provider.&nbsp;</p>
-
- <h4>Summary</h4><p>This example illustrates using Tuscany runtime
- in building a financial Web application&nbsp;using SCA programing
- model. &nbsp;The following key concepts are covered:</p>
-
- <ul>
- <li><b><i>Component implementations</i></b>. that provide web
- based&nbsp; HTML&nbsp;user interface</li>
-
- <li><b><i>Component implementations</i></b> that provide
- <b><i>local services</i></b> in Java. Local services implement
- internal application business logic such as tracking user state
- and are not exposed remotely.</li>
-
- <li><b><i>Component implementations</i></b> that have
- <b><i>configuration properties</i></b> and <b><i>service
- references</i></b> to other services</li>
-
- <li><b><i>Components</i></b> that use and
- <b><i>configure</i></b> <b><i>the properties and
- references</i></b> of component implementations</li>
-
- <li><b><i>SCA Services</i></b> to publish remotable services
- via a <b><i>Web Service binding</i></b>.</li>
-
- <li><b><i>SCA References&nbsp;</i></b> to consume remotable
- services via a <b><i>Web Service binding</i></b></li>
-
- <li>Assembling implementation, components, entry points and
- external service into composite components.</li>
-
- <li>Creating a module and all of its artifacts as part of a
- <b><i>web application</i></b> to show a front-end access to SCA
- services</li>
-
- <li>The use of Data Access services to persist and retrieve
- Service Data Objects from Apache Derby.</li>
-
- <li style="text-align: left;">The use of &nbsp;existing Web
- services in&nbsp; SCA.</li>
- </ul><p>BigBank sample provides the following user services: account
- balance,&nbsp;making deposits and withdrawals&nbsp; to purchase
- and sell stock, and to view current stock value.<br>
- The sample is organized into two SCA modules: webclient and
- account. The webclient module functionality is to provide user
- information and obtain user input. The account module is used to
- retrieve and store user information, account information, current
- stock information and the purchasing and selling of stock. The
- two modules interact via web services through SCA references and
- services.</p>
- <br>
-
- <div style="text-align: center;">
- <img style="width: 381px; height: 169px;" alt=
- "Overview of modules." title="Overview of modules." src=
- "docs/modualoverview.png" align="middle">
-
- <h5>Webclient</h5><br>
- <a href=
- "javascript:expandImage('docs/Show.Image.html?url=webclientmodule.png',1000,1100)">
- <img style="width: 300px; height: 200px;" alt="Webclient files"
- title="Click to expand" src="docs/webclientmodule.png"></a><br>
-
- <p>&nbsp;</p>
-
- <table style="text-align: left; width: 100%;" border="0"
- cellpadding="1" cellspacing="0" width="100%">
- <tbody>
- <tr>
- <td align="left" valign="top" width="*">
- <a href=
- "javascript:expandImage('docs/Show.Image.html?url=webclientfiles.png',850,500)">
- <img style="width: 262px; height: 360px;" alt=
- "Webclient files" title="Click to expand" src=
- "docs/webclientfiles.png"></a>&nbsp;<br>
-
- <div style="text-align: center;">
- <small><span style="font-style: italic;">click to
- enlarge</span></small>
- </div>
- </td>
-
- <td style="text-align: left;" align="left" valign="top"
- width="80%">
- <table style="text-align: left; width: 100%;" border=
- "0" cellpadding="1" cellspacing="0">
- <tbody>
- <tr>
- <td style="text-align: center;" colspan="3">
- <span style=
- "font-weight: bold; text-decoration: underline;">Java
- source files implementing SCA components and
- interfaces.</span></td>
- </tr>
-
- <tr>
- <td style="width: 10%;">
- AccountServiceComponentImpl.java</td>
-
- <td>&nbsp;</td>
-
- <td>Implements the account service.</td>
- </tr>
-
- <tr>
- <td>AccountLoginServiceImpl.java</td>
-
- <td></td>
-
- <td>Implements the Login service.</td>
- </tr>
-
- <tr>
- <td>LoginService.java</td>
-
- <td></td>
-
- <td>Interface for a services provided by a
- login&nbsp; service component.</td>
- </tr>
-
- <tr>
- <td>ProfileService.java</td>
-
- <td></td>
-
- <td>Interface for a service provided by a profile
- component.</td>
- </tr>
-
- <tr>
- <td>ProfileServiceImpl.java</td>
-
- <td></td>
-
- <td>Implements the profile component.</td>
- </tr>
-
- <tr>
- <td>SimpleLoginServiceImpl.java</td>
-
- <td></td>
-
- <td>A simple in memory login service.</td>
- </tr>
-
- <tr>
- <td style="text-align: center;" colspan="3">
- <span style=
- "font-weight: bold; text-decoration: underline;">Java
- source files implementing Web HTML
- interface.</span></td>
- </tr>
-
- <tr>
- <td>AccountStatusTag.java</td>
-
- <td></td>
-
- <td>Implements a jsp tag that&nbsp;displays the
- account information</td>
- </tr>
-
- <tr>
- <td>StockStatusTag.java</td>
-
- <td></td>
-
- <td>Implements a jsp tag that displays the stock
- information.</td>
- </tr>
-
- <tr>
- <td>LoginBarrierTag.java</td>
-
- <td></td>
-
- <td>Implements a jsp tag that ensures the user is
- logged in.</td>
- </tr>
-
- <tr>
- <td>ServiceTag.java</td>
-
- <td></td>
-
- <td>Places an SCA service in the JSP page
- context.</td>
- </tr>
-
- <tr>
- <td>FormServlet.java</td>
-
- <td></td>
-
- <td>Process user input and uses the
- AccountService component.</td>
- </tr>
-
- <tr>
- <td>LoginServlet.java</td>
-
- <td></td>
-
- <td>Processes logging in and logout.</td>
- </tr>
-
- <tr>
- <td style="text-align: center;" colspan="3">
- <span style=
- "font-weight: bold; text-decoration: underline;">Files
- that will be loaded as resources along
- classpath.</span></td>
- </tr>
-
- <tr>
- <td>AccountService.wsdl</td>
-
- <td></td>
-
- <td>WSDL that &nbsp;defines the account
- service.</td>
- </tr>
-
- <tr>
- <td>bigbank-tags.tld</td>
-
- <td></td>
-
- <td>Defines the tag libs for the user
- interface.</td>
- </tr>
-
- <tr align="center">
- <td colspan="3"><span style=
- "font-weight: bold; text-decoration: underline;">Files
- located in WEB-INF directory.</span></td>
- </tr>
-
- <tr>
- <td><a href="#SCDL">default.scdl</a></td>
-
- <td></td>
-
- <td>Application's SCA SCDL file.</td>
- </tr>
-
- <tr>
- <td><a href="#Web.xml">web.xml</a></td>
-
- <td></td>
-
- <td>Application's web.xml file.</td>
- </tr>
-
- <tr align="center">
- <td colspan="3"><span style=
- "font-weight: bold; text-decoration: underline;">Generated
- Files.</span></td>
- </tr>
-
- <tr>
- <td>sdo source</td>
-
- <td></td>
-
- <td>Generated SDO. Created by <a href=
- "#tuscany-sdo-plugin"><code><span style=
- "font-weight: bold;">tuscany-sdo-plugin</span></code></a>
- maven plugin.</td>
- </tr>
-
- <tr>
- <td>wsdl2java-source</td>
-
- <td></td>
-
- <td>Generated SDO interface. Created by <a href=
- "#tuscany-plugin-wsdl2java"><code><span style=
- "font-weight: bold;">tuscany-plugin-wsdl2java</span></code></a>
- maven &nbsp;plugin.</td>
- </tr>
-
- <tr align="center">
- <td colspan="3"><span style=
- "font-weight: bold; text-decoration: underline;">Build
- files.</span></td>
- </tr>
-
- <tr>
- <td><a href="#pom.xml">pom.xml</a></td>
-
- <td></td>
-
- <td>Maven build file.</td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
-
- <p>&nbsp;</p><!-- account -->
-
- <h5>Account</h5><br>
- <a href=
- "javascript:expandImage('docs/Show.Image.html?url=accountmodule.png',830,1400)">
- <img style="width: 300px; height: 200px;" alt="Account module"
- title="Click to expand" src="docs/accountmodule.png"></a><br>
-
- <p>&nbsp;</p>
-
- <table style="text-align: left; width: 100%;" border="0"
- cellpadding="1" cellspacing="0" width="100%">
- <tbody>
- <tr>
- <td align="left" valign="top" width="*">
- <a href=
- "javascript:expandImage('docs/Show.Image.html?url=accountfiles.png',850,500)">
- <img style="width: 262px; height: 360px;" alt=
- "Webclient files" title="Click to expand" src=
- "docs/accountfiles.png"></a>&nbsp;<br>
-
- <div style="text-align: center;">
- <small><span style="font-style: italic;">click to
- enlarge</span></small>
- </div>
- </td>
-
- <td style="text-align: left;" align="left" valign="top"
- width="80%">
- <table style="text-align: left; width: 100%;" border=
- "0" cellpadding="1" cellspacing="0">
- <tbody>
- <tr>
- <td style="text-align: center;" colspan="3">
- <span style=
- "font-weight: bold; text-decoration: underline;">Java
- source files implementing SCA components and
- interfaces.</span></td>
- </tr>
-
- <tr>
- <td style="width: 10%;">
- AccountServiceImpl.java</td>
-
- <td>&nbsp;</td>
-
- <td>Implements the account service
- component.</td>
- </tr>
-
- <tr>
- <td>AccountDataService.java</td>
-
- <td></td>
-
- <td>Interface defined for component implementing
- &nbsp;an account's data service.</td>
- </tr>
-
- <tr>
- <td>AccountDataServiceDASImpl.java</td>
-
- <td></td>
-
- <td>A Data Access Service (DAS) implementation of
- of the Account Data Service.</td>
- </tr>
-
- <tr>
- <td>AccountDataServiceImpl.java</td>
-
- <td></td>
-
- <td>A Data Service implementation not using
- DAS.</td>
- </tr>
-
- <tr>
- <td>AccountDBInit.java</td>
-
- <td></td>
-
- <td>A utility to just create the database and it
- table and fill in some initial data.</td>
- </tr>
-
- <tr>
- <td>StockQuote.java</td>
-
- <td></td>
-
- <td>A class to hold the StockQuote
- information.</td>
- </tr>
-
- <tr>
- <td>StockQuoteService.java</td>
-
- <td></td>
-
- <td>Interface defined for a component
- implementing a stock quote service.</td>
- </tr>
-
- <tr>
- <td>StockQuoteServiceImpl.java</td>
-
- <td></td>
-
- <td>Implements a fake stock quote service.</td>
- </tr>
-
- <tr>
- <td>StockQuoteWebservicexServiceImpl.java</td>
-
- <td></td>
-
- <td>Implements an actual stock quote
- service.</td>
- </tr>
-
- <tr>
- <td style="text-align: center;" colspan="3">
- <span style=
- "font-weight: bold; text-decoration: underline;">Files
- that will be loaded as resources along
- classpath.</span></td>
- </tr>
-
- <tr>
- <td>AccountService.wsdl</td>
-
- <td></td>
-
- <td>WSDL that &nbsp;defines the account
- service</td>
- </tr>
-
- <tr>
- <td>stockquotes.webservicex.wsdl</td>
-
- <td></td>
-
- <td>Actual stock quote service WSDL.</td>
- </tr>
-
- <tr>
- <td><a href=
- "#DAS_">DasAccountConfiguration.xml</a></td>
-
- <td></td>
-
- <td>Provides any needed configuration info
- including datasource properties, table
- definitions,</td>
- </tr>
-
- <tr align="center">
- <td colspan="3"><span style=
- "font-weight: bold; text-decoration: underline;">Files
- located in WEB-INF directory.</span></td>
- </tr>
-
- <tr>
- <td><a href="#SCDL">default.scdl</a></td>
-
- <td></td>
-
- <td>Application's SCA SCDL file.</td>
- </tr>
-
- <tr>
- <td><a href="#Web.xml">web.xml</a></td>
-
- <td></td>
-
- <td>Application's web.xml file.</td>
- </tr>
-
- <tr align="center">
- <td colspan="3"><span style=
- "font-weight: bold; text-decoration: underline;">Generated
- Files.</span></td>
- </tr>
-
- <tr>
- <td>sdo source</td>
-
- <td></td>
-
- <td>Generated SDO. Created by&nbsp;<a href=
- "#tuscany-sdo-plugin"><code><span style=
- "font-weight: bold;">tuscany-sdo-plugin</span></code></a>
- maven plugin.</td>
- </tr>
-
- <tr>
- <td>wsdl2java-source</td>
-
- <td></td>
-
- <td>Generated SDO interface. Created
- by&nbsp;<a href=
- "#tuscany-plugin-wsdl2java"><code><span style=
- "font-weight: bold;">tuscany-plugin-wsdl2java</span></code></a>
- maven &nbsp;plugin.</td>
- </tr>
-
- <tr align="center">
- <td colspan="3"><span style=
- "font-weight: bold; text-decoration: underline;">Build
- files.</span></td>
- </tr>
-
- <tr>
- <td><a href="#pom.xml">pom.xml</a></td>
-
- <td></td>
-
- <td>Maven build file.</td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- </div><br>
- <br>
-
-
- <h5><a name="pom.xml" id="pom.xml"></a>Pom.xml</h5>
- <p>The directions
- for maven&nbsp; how&nbsp; to build the each module is located in
- each module's directory in the&nbsp;pom.xml file. &nbsp;The
- application uses Java 1.5 and thus in the build &nbsp;plugin
- section needs the following compiler directives:</p>
- &nbsp;&nbsp;<code>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- &lt;plugin&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- &lt;groupId&gt;org.apache.maven.plugins&lt;/groupId&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- &lt;artifactId&gt;maven-compiler-plugin&lt;/artifactId&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- &lt;configuration&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- &lt;source&gt;<span style=
- "color: rgb(255, 0, 0); font-weight: bold;">1.5</span>&lt;/source&gt;<br>
-
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- &lt;target&gt;<span style=
- "color: rgb(255, 0, 0); font-weight: bold;">1.5</span>&lt;/target&gt;<br>
-
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- &lt;/configuration&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- &lt;/plugin&gt;</code><br>
- <p>Both webclient and account uses three maven
- plugins:&nbsp;<code style=
- "font-weight: bold;">tuscany-sdo-plugin</code>,&nbsp;<code style=
- "font-weight: bold;">tuscany-plugin-wsdl2java</code>,
- and&nbsp;<code style=
- "font-weight: bold;">tuscany-war-plugin</code>.
- The&nbsp;tuscany-sdo-plugin is provided by Tuscany 's SDO project
- while the other two are provided by the Tuscany SCA project.</p>
- <p>The <code style="font-weight: bold;"><a name="tuscany-sdo-plugin"
- id="tuscany-sdo-plugin"></a>tuscany-sdo-plugin</code>
- &nbsp;references the WSDL's schema and generates all the files
- located in target/sdo_source directory. &nbsp;The application
- uses these classes as a databinding instead of having to deal
- directly with XML that &nbsp;represents form as defined in the
- WSDL's schema.</p>
- <p>The <code style="font-weight: bold;"><a name=
- "tuscany-plugin-wsdl2java" id=
- "tuscany-plugin-wsdl2java"></a>tuscany-plugin-wsdl2java</code>
- plugin generates a Java interface in the target/wsdl2java-source
- directory that is used to define the inteface (prottype) in the
- wsdl.</p>
- <p>The <code style="font-weight: bold;">tuscany-war-plugin</code> is
- used to add both the Tuscany runtime and any Tuscany&nbsp;
- extensions required by the application in the war file.. Looking
- at the pom.xml and search for &nbsp;"<code style=
- "font-weight: bold;">tuscany-war-plugin"</code> you'll find the
- plugin. &nbsp;Which extension you want loaded are specified in
- the <code><span style=
- "font-weight: bold;">extensions</span></code> section. The format
- for this&nbsp; closely follows Maven's artifact naming. &nbsp;The
- boolean <code><span style=
- "font-weight: bold;">loadExtensionDependencies</span></code>
- option if true will &nbsp;resolve all dependencies for each
- extension listed here and also include them in the war file.
- &nbsp;<br>
- <br>
-
- <h4>Application</h4>
-
- <h5><a name="Web.xml" id="Web.xml"></a>Web.xml</h5><p>The web.xml
- file in each module adds necessary "hooks" to initiate and
- maintain the Tuscany SCA runtime in a web application host.<br>
- &nbsp;</p>
-
- <table style="text-align: left; width: 100%;" border="1"
- cellpadding="2" cellspacing="2">
- <tbody>
- <tr>
- <td>
- <pre>
-<small>&lt;listener&gt;<br>
-&lt;listener-class&gt;org.apache.tuscany.runtime.webapp.TuscanyContextListener&lt;/listener-class&gt;<br>
-&lt;/listener&gt;</small>
-</pre>
- </td>
-
- <td>This class initializes the Tuscany runtime when the
- applications is started and helps finalize the Tuscany
- runtime when the application has ended.</td>
- </tr>
-
- <tr>
- <td>
- <pre>
-<small>&lt;servlet&gt;<br>
-&lt;servlet-name&gt;TuscanyServlet&lt;/servlet-name&gt;<br>
-&lt;display-name&gt;Tuscany Servlet&lt;/display-name&gt;<br>
-&lt;servlet-class&gt;org.apache.tuscany.runtime.webapp.TuscanyServlet&lt;/servlet-class&gt;<br>
-&lt;/servlet&gt;</small>
-</pre>
- </td>
-
- <td>This class provides the web applications servlet
- interface to SCA components. &nbsp;The Axis websevices
- binding extension requires this.</td>
- </tr>
-
- <tr>
- <td>
- <pre>
-<small>&lt;listener&gt;<br>
-&lt;listener-class&gt;org.apache.tuscany.runtime.webapp.TuscanySessionListener&lt;/listener-class&gt;<br>
-&lt;/listener&gt;</small>
-</pre>
- </td>
-
- <td>This listener helps provide SCA session support .</td>
- </tr>
- </tbody>
- </table><br>
- <p>The web application can be run in offline or online when
- resolving dependencies required by the application or it's
- required extensions. This is configured in the web.xml with the
- context-param element with a parameter name <code><span style=
- "font-weight: bold;">tuscany.online</span></code>. If&nbsp; not
- specified or set to true, dependencies are resolved by searching
- the local war repository, the local Maven repository, and remote
- repositories. If specified and set to false, the remote
- repositories will not be searched.</p>
-
- <h5><a name="SCDL" id="SCDL"></a>SCDL</h5>
- <p>Each module's SCA
- application SCDL is located in the web application&nbsp;
- WEB-INF/default.scdl file. &nbsp;This is the default location,
- but within the web.xml it is possible to override this with a
- context-param element &nbsp;with the name <code><span style=
- "font-weight: bold;">tuscany.applicationScdlPath</span></code>.
- &nbsp;The Tuscany System SCDL can also be overridden with another
- context-param element with the name <code><span style=
- "font-weight: bold;">tuscany.systemScdlPath</span></code>.<br>
- The SCDL&nbsp; used by the BigBank application is defined by
- <a href=
- "http://www.osoa.org/download/attachments/35/SCA_AssemblyModel_V096.pdf?version=1"
- target="_blank">SCA Assembly Model V0.96</a> , <a href=
- "http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforJava_v0.95.pdf?version=3"
- target="_blank">SCA Client and Implementation Model for Java
- (V0.95)</a> &nbsp;and the <a href=
- "http://www.osoa.org/download/attachments/35/SCA_WebServiceBindings_V096-draft1.pdf?version=3"
- target="_blank">SCA Web Service bindings</a> specifications.<br>
- There is one extension to SCDL used by BigBank that is specific
- to Tuscany that is used by SDO databinding extension.
- &nbsp;The&nbsp;<code>import.sdo</code> element in the SCDL
- specifies which&nbsp; SDO factories to register the SDO types.
- &nbsp;In the case of BigBank the factory is the class generated
- by the&nbsp;<code style=
- "font-weight: bold;">tuscany-sdo-plugin</code> maven plugin. An
- example of this follows:</p>
- <pre>
- <code>&lt;dbsdo:import.sdo xmlns:dbsdo="http://incubator.apache.org/tuscany/xmlns/databinding/sdo/1.0-incubator-M2"
-factory="com.bigbank.account.AccountFactory"/&gt; <br>
-</code>
-</pre>
-
- <h5>Code</h5><p>The Java code for the most part just implements the
- Web interface and the SCA components necessary to implement the
- business logic. The code uses Java 5.0 annotations as documented
- by the <a href=
- "http://www.osoa.org/download/attachments/35/SCA_ClientAndImplementationModelforJava_v0.95.pdf?version=3"
- target="_blank">SCA Client and Implementation Model for Java
- (V0.95)</a> specifications. The samples uses one annotation that
- is an Tuscany extension that is used by the databinding framework
- to identify that the components expect to SDO s for complex data
- types. An example of this is seen in the AccountService interface
- which has the <code style=
- "font-weight: bold;">@DataType(name="commonj.sdo.DataObject")</code>
- annotation.</p>
-
- <h4><a name="DAS_" id="DAS_"></a><span style=
- "font-family: monospace;">RDB DAS</span></h4>
-
- <p>The Relational Database DAS (RDB DAS) is used in this sample to access relational data in terms
- of SDOs. All the code pertaining to this usage is contained to two one files:
- AccountDataServiceDASImpl.java and DasAccountConfiguration.xml. The java file provides code that
- instantiates and invokes the DAS and the XML file provides RDB DAS configuration.</p>
-
- <p>The sample demonstrates a few of the RDB DAS capabilities including:</p>
-
- <ul>
-
- <li>reading a graph of SDOs based on a select query provided inline </li>
- <li>reading a graph of SDOs based on a named select query defined in the config file </li>
- <li>executing a named command to manually insert data</li>
- <li>leveraging SDO Change Summary to by utilizing the DAS "applyChanges" method to flush graph modifications </li>
- <li>utilizing the DAS column-converter framework </li>
- <li>using the column/property name mapping (aliasing)</li>
-
- </ul>
-
- <p>This sample does not currently demonstrate a few other key DAS features including Object relationships, optimistic
- concurrency control, and the use of convention over configuration. User level documentation for the RDB DAS can
- be found in the <a href=
- "http://wiki.apache.org/ws/Tuscany/TuscanyJava/DAS_Java_Overview/RDBDAS_Java_User_Guide"target="_blank">RDBDAS User's Guide</a>.
- </p>
- <p>This sample uses the RDB DAS as a utility. A future version of this sample will access the DAS as an SCA service.
- </p>
-
-</body>
-</html>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/pom.xml b/branches/sca-java-0.99/samples/old/bigbank/webclient/pom.xml
deleted file mode 100644
index 40e146685a..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/pom.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <parent>
- <groupId>org.apache.tuscany.samples.bigbank</groupId>
- <artifactId>bigbank-scenario</artifactId>
- <version>0.1-integration-incubating-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>sample-bigbank-webclient</artifactId>
- <packaging>war</packaging>
- <name>Tuscany BigBank Web Client Module</name>
- <description>BigBank Scenario Sample - Web Front-End Module</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-api</artifactId>
- <version>${scaKernelVersion}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-api-r2.1</artifactId>
- <version>1.0-incubating</version>
- <scope>compile</scope>
- </dependency>
- <!-- SDO's XMLStreamHelper requires StAX API and impl (it's not pulled by
- tuscany-sdo-impl because the maven dependency scope is provided -->
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
- <artifactId>webapp-api</artifactId>
- <version>${scaKernelVersion}</version>
- <scope>runtime</scope>
- </dependency>
-
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
-
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating</version>
- <executions>
- <execution>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca.extensions.axis2.plugins</groupId>
- <artifactId>tuscany-plugin-wsdl2java</artifactId>
- <version>${scaKernelVersion}</version>
- <executions>
- <execution>
- <configuration>
- <wsdlFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</wsdlFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
- <artifactId>tuscany-war-plugin</artifactId>
- <version>${scaKernelVersion}</version>
- <executions>
- <execution>
- <id>tuscany-war</id>
- <goals>
- <goal>tuscany-war</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <!-- Set to true to embed external jars for extensions in the WAR -->
- <!-- Set to false to leave external jars for extensions to be resolved from maven repository -->
- <loadExtensionDependencies>false</loadExtensionDependencies>
-
- <extensions>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>tuscany-axis2</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
-
- </extensions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
deleted file mode 100644
index a0f98f14f3..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.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 bigbank.webclient.services.account;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.ServiceUnavailableException;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountService;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-/**
- */
-@Service(AccountService.class)
-public class AccountServiceComponentImpl implements AccountService {
-
- private AccountService accountService;
-
- @Reference
- public void setAccountService(AccountService accountService) {
- this.accountService = accountService;
- }
-
- /**
- *
- */
- public AccountServiceComponentImpl() {
- super();
- }
-
- /**
- * @see bigbank.account.services.account.AccountService#getAccountReport(java.lang.String)
- */
- public AccountReport getAccountReport(int customerID) {
- try {
- return accountService.getAccountReport(customerID);
- } catch (Exception e) {
- throw new ServiceUnavailableException(e);
- }
- }
-
- public StockSummary purchaseStock(int customerID, StockSummary stockSummary) throws RemoteException {
- try {
- return accountService.purchaseStock(customerID, stockSummary);
- } catch (Exception e) {
- throw new ServiceUnavailableException(e);
- }
- }
-
- public CustomerProfileData getCustomerProfile(String param2) throws RemoteException {
- try {
- return accountService.getCustomerProfile(param2);
- } catch (Exception e) {
- throw new ServiceUnavailableException(e);
- }
- }
-
- public float deposit(String account, float amount) throws RemoteException {
- try {
- return accountService.deposit(account, amount);
- } catch (Exception e) {
- throw new ServiceUnavailableException(e);
- }
- }
-
- public StockSummary sellStock(int purchaseLotNumber, int quantity) throws RemoteException {
- try {
- return accountService.sellStock(purchaseLotNumber, quantity);
- } catch (Exception e) {
- throw new ServiceUnavailableException(e);
- }
- }
-
- public float withdraw(String account, float amount) throws RemoteException {
- try {
- return accountService.withdraw(account, amount);
- } catch (Exception e) {
- throw new ServiceUnavailableException(e);
- }
- }
-
- public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
- throws RemoteException {
-
- return accountService.createAccount(customerProfile, createSavings, createCheckings);
- }
-
- public AccountLog getAccountLog(int customerID) throws RemoteException {
- try {
- return accountService.getAccountLog(customerID);
- } catch (Exception e) {
- throw new ServiceUnavailableException(e);
- }
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
deleted file mode 100644
index d6c40e8dda..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.services.profile;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import com.bigbank.account.AccountService;
-import com.bigbank.account.CustomerProfileData;
-
-@Service(LoginService.class)
-@Scope("COMPOSITE")
-public class AccountLoginServiceImpl implements LoginService {
-
- public AccountService accountService;
-
- @Reference
- public void setAccountService(AccountService accountService) {
- this.accountService = accountService;
- }
-
- public ProfileService profileService;
-
- @Reference
- public void setProfileService(ProfileService profileService) {
- this.profileService = profileService;
- }
-
- public int login(String userName, String password) throws RemoteException {
-
- CustomerProfileData profileData = accountService.getCustomerProfile(userName);
-
- if (!password.equals(profileData.getPassword())) {
- return INVALID_PASSWORD;
- }
-
- profileService.setLoggedIn(true);
- profileService.setFirstName(profileData.getFirstName());
- profileService.setLastName(profileData.getLastName());
- profileService.setId(profileData.getId());
-
- return SUCCESS;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
deleted file mode 100644
index c688df2597..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.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 bigbank.webclient.services.profile;
-
-import java.rmi.RemoteException;
-
-import org.apache.tuscany.api.annotation.DataType;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface LoginService {
-
- static final int SUCCESS = 1;
-
- static final int INVALID_LOGIN = -1;
-
- static final int INVALID_PASSWORD = -2;
-
- int login(String userName, String password) throws RemoteException;
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
deleted file mode 100644
index 551d80c935..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.services.profile;
-
-import org.apache.tuscany.api.annotation.DataType;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ProfileService {
-
- String getFirstName();
-
- void setFirstName(String pName);
-
- String getLastName();
-
- void setLastName(String pName);
-
- boolean isLoggedIn();
-
- void setLoggedIn(boolean pStatus);
-
- int getId();
-
- void setId(int pId);
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java
deleted file mode 100644
index 5385a7c3fc..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.services.profile;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ProfileService.class)
-@Scope("SESSION")
-public class ProfileServiceImpl implements ProfileService {
-
- private String firstName;
-
- public String getFirstName() {
- return firstName;
- }
-
- @Property
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- private String lastName;
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
- private boolean loggedIn;
-
- public boolean isLoggedIn() {
- return loggedIn;
- }
-
- public void setLoggedIn(boolean status) {
- loggedIn = status;
- }
-
- private int id;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java
deleted file mode 100644
index 711c6ba0b9..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.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 bigbank.webclient.services.profile;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(LoginService.class)
-public class SimpleLoginServiceImpl implements LoginService {
-
- public ProfileService profileService;
-
- @Reference
- public void setProfileService(ProfileService profileService) {
- this.profileService = profileService;
- }
-
- public int login(String userName, String password) {
-
- if (!"test".equals(userName)) {
- return INVALID_LOGIN;
- }
-
- if (!"password".equals(password)) {
- return INVALID_PASSWORD;
- }
-
- profileService.setLoggedIn(true);
- profileService.setFirstName("John");
- profileService.setLastName("Doe");
- profileService.setId(12345);
-
- return SUCCESS;
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java
deleted file mode 100644
index 08751bdc3d..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountLogTag.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.tags.account;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-import bigbank.webclient.services.profile.ProfileService;
-
-import com.bigbank.account.AccountLog;
-import com.bigbank.account.AccountService;
-
-public class AccountLogTag extends TagSupport {
-
- public AccountLogTag() {
- super();
- }
-
- private String mAccountService;
-
- public String getAccountService() {
- return mAccountService;
- }
-
- public void setAccountService(String pAccountService) {
- mAccountService = pAccountService;
- }
-
- private String mProfileService;
-
- public String getProfileService() {
- return mProfileService;
- }
-
- public void setProfileService(String pProfileService) {
- mProfileService = pProfileService;
- }
-
- private String mId;
-
- @Override
- public String getId() {
- return mId;
- }
-
- @Override
- public void setId(String pId) {
- mId = pId;
- }
-
- private Iterator mIterator;
-
- @Override
- public int doStartTag() throws JspException {
- CompositeContext moduleContext = CurrentCompositeContext.getContext();
-
- ProfileService profile = moduleContext.locateService(ProfileService.class, mProfileService);
-
- if (profile == null) {
- throw new JspException("Profile [" + mProfileService + "] not found in current module context");
- }
-
- AccountService service = (AccountService) moduleContext.locateService(AccountService.class, mAccountService);
- if (service == null) {
- throw new JspException("Service [" + mAccountService + "] not found in current module context");
- }
- List entries;
- try {
- AccountLog accountLog = service.getAccountLog(profile.getId());
- pageContext.setAttribute("StockLogEntries", accountLog.getStockLogEntries());
- entries = accountLog.getAccountLogEntries();
- } catch (Exception e) {
- throw new JspException(e);
- }
- mIterator = entries.iterator();
- if (mIterator.hasNext()) {
- pageContext.setAttribute(mId, mIterator.next());
- return EVAL_BODY_INCLUDE;
- } else {
- return SKIP_BODY;
- }
- }
-
- @Override
- public int doAfterBody() {
- if (mIterator.hasNext()) {
- pageContext.setAttribute(mId, mIterator.next());
- return EVAL_BODY_AGAIN;
- } else {
- return SKIP_BODY;
- }
- }
-
- @Override
- public void release() {
- super.release();
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
deleted file mode 100644
index 3733cc84dd..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.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 bigbank.webclient.tags.account;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-import bigbank.webclient.services.profile.ProfileService;
-
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountService;
-
-/**
- * Retrieves and iterates over account summary information for the current profile by accessing the remotable account service component
- */
-
-public class AccountStatusTag extends TagSupport {
-
- // ----------------------------------
- // Constructors
- // ----------------------------------
-
- public AccountStatusTag() {
- super();
- }
-
- // ----------------------------------
- // Methods
- // ----------------------------------
-
- private String mAccountService;
-
- public String getAccountService() {
- return mAccountService;
- }
-
- public void setAccountService(String pAccountService) {
- mAccountService = pAccountService;
- }
-
- private String mProfileService;
-
- public String getProfileService() {
- return mProfileService;
- }
-
- public void setProfileService(String pProfileService) {
- mProfileService = pProfileService;
- }
-
- private String mId;
-
- @Override
- public String getId() {
- return mId;
- }
-
- @Override
- public void setId(String pId) {
- mId = pId;
- }
-
- private Iterator mIterator;
-
- @Override
- public int doStartTag() throws JspException {
- CompositeContext moduleContext = CurrentCompositeContext.getContext();
-
- ProfileService profile = moduleContext.locateService(ProfileService.class, mProfileService);
-
- if (profile == null) {
- throw new JspException("Profile [" + mProfileService + "] not found in current module context");
- }
-
- AccountService service = (AccountService) moduleContext.locateService(AccountService.class, mAccountService);
-
- if (service == null) {
- throw new JspException("Service [" + mAccountService + "] not found in current module context");
- }
- List summaries;
- try {
- AccountReport accountReport = service.getAccountReport(profile.getId());
- pageContext.setAttribute("StockSummaries", accountReport.getStockSummaries());
- summaries = accountReport.getAccountSummaries();
- } catch (Exception e) {
- throw new JspException(e);
- }
- mIterator = summaries.iterator();
- if (mIterator.hasNext()) {
- pageContext.setAttribute(mId, mIterator.next());
- return EVAL_BODY_INCLUDE;
- } else {
- return SKIP_BODY;
- }
- }
-
- @Override
- public int doAfterBody() {
- if (mIterator.hasNext()) {
- pageContext.setAttribute(mId, mIterator.next());
- return EVAL_BODY_AGAIN;
- } else {
- return SKIP_BODY;
- }
- }
-
- @Override
- public void release() {
- super.release();
- mId = null;
- mIterator = null;
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java
deleted file mode 100644
index ea2df8aa55..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockLogTag.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.tags.account;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-public class StockLogTag extends TagSupport {
-
- public StockLogTag() {
- super();
- }
-
- private String mId;
-
- @Override
- public String getId() {
- return mId;
- }
-
- @Override
- public void setId(String pId) {
- mId = pId;
- }
-
- private Iterator mIterator;
-
- @Override
- public int doStartTag() throws JspException {
-
- List entries = (List) pageContext.getAttribute("StockLogEntries");
- if (null == entries) {
- return SKIP_BODY;
- }
- mIterator = entries.iterator();
- if (mIterator.hasNext()) {
- pageContext.setAttribute(mId, mIterator.next());
- return EVAL_BODY_INCLUDE;
- } else {
- return SKIP_BODY;
- }
- }
-
- @Override
- public int doAfterBody() {
- if (mIterator.hasNext()) {
- pageContext.setAttribute(mId, mIterator.next());
- return EVAL_BODY_AGAIN;
- } else {
- pageContext.setAttribute("StockLogEntries", null);
- return SKIP_BODY;
- }
- }
-
- @Override
- public void release() {
- pageContext.setAttribute("StockLogEntries", null);
- super.release();
- mId = null;
- mIterator = null;
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
deleted file mode 100644
index b2c61193e7..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.tags.account;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-/**
- * Retrieves and iterates over account summary information for the current profile by accessing the remotable account service component
- */
-
-public class StockStatusTag extends TagSupport {
-
- public StockStatusTag() {
- super();
- }
-
- private String mId;
-
- @Override
- public String getId() {
- return mId;
- }
-
- @Override
- public void setId(String pId) {
- mId = pId;
- }
-
- private Iterator mIterator;
-
- @Override
- public int doStartTag() throws JspException {
-
- List summaries = (List) pageContext.getAttribute("StockSummaries");
- if (null == summaries) {
- return SKIP_BODY;
- }
- mIterator = summaries.iterator();
- if (mIterator.hasNext()) {
- pageContext.setAttribute(mId, mIterator.next());
- return EVAL_BODY_INCLUDE;
- } else {
- return SKIP_BODY;
- }
- }
-
- @Override
- public int doAfterBody() {
- if (mIterator.hasNext()) {
- pageContext.setAttribute(mId, mIterator.next());
- return EVAL_BODY_AGAIN;
- } else {
- pageContext.setAttribute("StockSummaries", null);
- return SKIP_BODY;
- }
- }
-
- @Override
- public void release() {
- pageContext.setAttribute("StockSummaries", null);
- super.release();
- mId = null;
- mIterator = null;
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
deleted file mode 100644
index 6c50595d0f..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.tags.sca;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-import bigbank.webclient.services.profile.ProfileService;
-
-public class LoginBarrierTag extends TagSupport {
-
- public LoginBarrierTag() {
- super();
- }
-
- private String mProfile;
-
- public String getProfile() {
- return mProfile;
- }
-
- public void setProfile(String pProfile) {
- mProfile = pProfile;
- }
-
- private String mUrl;
-
- public String getUrl() {
- return mUrl;
- }
-
- public void setUrl(String pUrl) {
- mUrl = pUrl;
- }
-
- int doPage = EVAL_PAGE;
-
- @Override
- public int doStartTag() throws JspException {
- if (mProfile == null || mProfile.length() < 1) {
- throw new JspException("Invalid profile location specified");
- }
-
- CompositeContext moduleContext = CurrentCompositeContext.getContext();
-
- ProfileService profile = moduleContext.locateService(ProfileService.class, mProfile);
-
- if (profile == null) {
- throw new JspException("Profile [" + mProfile + "] not found in current module context");
- }
-
- if (profile.isLoggedIn()) {
- return EVAL_BODY_INCLUDE;
- } else {
- try {
- doPage = SKIP_PAGE;
- pageContext.forward(mUrl);
- ((HttpServletResponse) (pageContext.getResponse())).sendRedirect("login.html");
- return SKIP_BODY;
- } catch (ServletException e) {
- throw new JspException("Unable to forward to [" + mUrl + "]");
- } catch (IOException e) {
- throw new JspException("Unable to forward to [" + mUrl + "]");
- }
- }
- }
-
- @Override
- public int doEndTag() throws JspException {
- return doPage;
- }
-
- @Override
- public void release() {
- super.release();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
deleted file mode 100644
index d1263377c2..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.tags.sca;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-/**
- * Places an SCA service in the JSP page context, making it available to other tags corresponding to its id value.
- */
-
-public class ServiceTag extends TagSupport {
-
- // ----------------------------------
- // Constructors
- // ----------------------------------
-
- public ServiceTag() {
- super();
- }
-
- // ----------------------------------
- // Methods
- // ----------------------------------
-
- private String mName;
-
- /**
- * Returns the name of the SCA service to import into the page context.
- */
- public String getName() {
- return mName;
- }
-
- /**
- * Sets name of the SCA service to import into the page context.
- */
- public void setName(String pName) {
- mName = pName;
- }
-
- private String mId;
-
- /**
- * Returns the id of the service in the page context
- */
- @Override
- public String getId() {
- return mId;
- }
-
- /**
- * Sets the id of the service for the page context
- */
-
- @Override
- public void setId(String pId) {
- mId = pId;
- }
-
- @Override
- public int doStartTag() throws JspException {
- CompositeContext moduleContext = CurrentCompositeContext.getContext();
-
- Object service = moduleContext.locateService(Object.class, mName);
-
- if (service == null) {
- throw new JspException("Service [" + mName + "] not found in current module context");
- }
- if (mId == null) {
- // if the Id name was not specified, default to the basic name of the
- // service
- mId = mName;
- }
- pageContext.setAttribute(mId, service);
- return EVAL_BODY_INCLUDE;
- }
-
- @Override
- public int doEndTag() throws JspException {
- return EVAL_PAGE;
- }
-
- @Override
- public void release() {
- super.release();
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
deleted file mode 100644
index 3acdbee845..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.ui;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-import bigbank.webclient.services.profile.ProfileService;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountService;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class FormServlet extends HttpServlet {
-
- // private ServletContext mContext;
- // public void init(ServletConfig pCfg) throws ServletException {
- // mContext = pCfg.getServletContext();
- // }
-
- @Override
- public void doPost(HttpServletRequest pReq, HttpServletResponse pResp) throws ServletException {
-
- try {
- final String action = pReq.getParameter("action");
-
- CompositeContext moduleContext = CurrentCompositeContext.getContext();
- AccountService accountServices = (AccountService) moduleContext.locateService(AccountService.class, "AccountServiceComponent");
- if (accountServices == null) {
- throw new ServletException("AccountServiceComponent");
- }
- ProfileService profileServices = null;
- if (!"createAccount".equals(action)) {
- profileServices = moduleContext.locateService(ProfileService.class, "ProfileServiceComponent");
- if (profileServices == null) {
- throw new ServletException("ProfileServiceComponent not found.");
- }
- if (!profileServices.isLoggedIn()) {
- throw new ServletException("User id '" + profileServices.getId() + "' not logged on.");
- }
- }
-
- if ("createAccount".equals(action)) {
- createAccount(pReq, pResp, accountServices);
- } else if ("account".equals(action)) {
- accountTransaction(pReq, pResp, accountServices);
- } else if ("stockPurchase".equals(action)) {
- stockPurchase(pReq, pResp, profileServices, accountServices);
- } else if ("stockSale".equals(action)) {
- stockSale(pReq, pResp, profileServices, accountServices);
- } else {
- throw new IllegalArgumentException("Unknown action in Form servlet '" + action + "'.");
- }
- // mContext.getRequestDispatcher("summary.jsp").forward(pReq, pResp);
- pResp.sendRedirect("summary.jsp");
- } catch (ServletException e) {
- e.printStackTrace();
- throw e;
-
- } catch (Exception e) {
-
- throw new ServletException(e);
- }
-
- }
-
- private void stockSale(HttpServletRequest req, HttpServletResponse resp, ProfileService profileServices, AccountService accountServices)
- throws ServletException {
- try {
- if (!"cancel".equals(req.getParameter("cancel"))) {
-
- int quantity = Integer.parseInt(req.getParameter("quantity"));
- int purchaseLotNumber = Integer.parseInt(req.getParameter("purchaseLotNumber"));
- accountServices.sellStock(purchaseLotNumber, quantity);
- }
-
- } catch (Exception e) {
-
- throw new ServletException("stockSale " + e.getMessage(), e);
- }
-
- }
-
- private void stockPurchase(HttpServletRequest req, HttpServletResponse resp, ProfileService profileServices, AccountService accountServices)
- throws ServletException {
- try {
- if (!"cancel".equals(req.getParameter("cancel"))) {
-
- String symbol = req.getParameter("symbol").trim().toUpperCase();
- int quantity = Integer.parseInt(req.getParameter("quantity"));
- StockSummary stockSummry = AccountFactory.INSTANCE.createStockSummary();
- stockSummry.setSymbol(symbol);
- stockSummry.setQuantity(quantity);
- accountServices.purchaseStock(profileServices.getId(), stockSummry);
- }
- } catch (Exception e) {
- throw new ServletException("stockPurchase " + e.getMessage(), e);
- }
- }
-
- private void accountTransaction(HttpServletRequest req, HttpServletResponse resp, AccountService accountServices) throws ServletException {
- try {
- if (!"cancel".equals(req.getParameter("cancel"))) {
- String account = req.getParameter("account");
- String amount = req.getParameter("Amount");
- if ("deposit".equals(req.getParameter("actionType"))) {
- accountServices.deposit(account, Float.parseFloat(amount));
- } else {
- accountServices.withdraw(account, Float.parseFloat(amount));
- }
- }
- } catch (Exception e) {
- throw new ServletException("accountTransaction " + e.getMessage(), e);
- }
-
- }
-
- private void createAccount(HttpServletRequest pReq, HttpServletResponse pResp, AccountService accountServices) throws ServletException {
- try {
- CustomerProfileData customerProfileData = AccountFactory.INSTANCE.createCustomerProfileData();
- customerProfileData.setFirstName(pReq.getParameter("firstName"));
- customerProfileData.setLastName(pReq.getParameter("lastName"));
- customerProfileData.setAddress(pReq.getParameter("address"));
- customerProfileData.setEmail(pReq.getParameter("email"));
- customerProfileData.setLoginID(pReq.getParameter("loginID"));
- customerProfileData.setPassword(pReq.getParameter("password"));
-
- CustomerProfileData resp = accountServices.createAccount(customerProfileData, "savings".equals(pReq.getParameter("savings")), "checkings"
- .equals(pReq.getParameter("checkings")));
- LoginServlet.login(resp.getLoginID(), resp.getPassword());
-
- } catch (IOException e) {
- throw new ServletException(e);
- }
-
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
deleted file mode 100644
index 784cc4fb40..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.ui;
-
-import java.io.IOException;
-import java.rmi.RemoteException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-import bigbank.webclient.services.profile.LoginService;
-
-public class LoginServlet extends HttpServlet {
-
- @Override
- public void init(ServletConfig pCfg) throws ServletException {
-
- }
-
- @Override
- public void doPost(HttpServletRequest pReq, HttpServletResponse pResp) throws ServletException {
-
- if ("logout".equals(pReq.getParameter("logout")) || "logoutHIDDEN".equals(pReq.getParameter("logoutHIDDEN"))) {
- HttpSession sess = pReq.getSession();
- if (sess != null) {
- sess.invalidate();
- }
- try {
- pResp.sendRedirect("login.html");
- } catch (IOException e) {
-
- e.printStackTrace();
- throw new ServletException(e);
- }
-
- } else {
- pReq.getSession(); // make sure session started.
- String login = pReq.getParameter("login");
- String password = pReq.getParameter("password");
- try {
- int resp = login(login, password);
- if (resp == LoginService.SUCCESS) {
-
- pResp.sendRedirect("summary.jsp");
- } else {
-
- pResp.sendRedirect("login.html");
- }
- } catch (IOException e) {
- throw new ServletException(e);
- }
- }
- }
-
- static int login(final String login, final String password) throws ServletException {
-
- CompositeContext moduleContext = CurrentCompositeContext.getContext();
- LoginService loginMgr = moduleContext.locateService(LoginService.class, "LoginServiceComponent");
-
- if (loginMgr == null) {
- throw new ServletException("LoginManager not found");
- }
-
- try {
- return loginMgr.login(login, password);
- } catch (RemoteException e) {
-
- throw new ServletException(e);
- }
-
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index 980c0cf279..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:account="http://www.bigbank.com/account"
- targetNamespace="http://www.bigbank.com/account"
- name="AccountService">
-
- <wsdl:types>
- <xsd:schema targetNamespace="http://www.bigbank.com/account"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:account="http://www.bigbank.com/account"
-
- > <!-- xmlns:sdojava="commonj.sdo/java" sdojava:package="org.apache.tuscany.samples.bigbank.account" -->
-
-
-<!-- <xsd:complexType name="DataGraphRoot">
- <xsd:sequence>
- <xsd:element name="customerProfileData" type="account:CustomerProfileData" maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="StockSummaries" type="account:StockSummary" maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="AccountSummaries" type="account:AccountSummary" maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="StockLogEntries" type="account:StockLogEntry" maxOccurs="unbounded" minOccurs="0" />
- <xsd:element name="AccountLogEntries" type="account:AccountLogEntry" maxOccurs="unbounded" minOccurs="0" />
- </xsd:sequence>
- </xsd:complexType>-->
-
-
- <xsd:element name="getAccountReport">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="customerID"
- type="xsd:int" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="getAccountReportResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="accountReport"
- type="account:AccountReport" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="AccountReport">
- <xsd:sequence>
- <xsd:element name="accountSummaries"
- type="account:AccountSummary" maxOccurs="unbounded" />
- <xsd:element name="stockSummaries"
- type="account:StockSummary" maxOccurs="unbounded" />
-
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="AccountSummary">
- <xsd:attribute name="accountNumber" type="xsd:string" />
- <xsd:attribute name="accountType" type="xsd:string" />
- <xsd:attribute name="balance" type="xsd:float" />
- </xsd:complexType>
-
- <xsd:complexType name="StockSummary">
- <xsd:attribute name="purchaseLotNumber" type="xsd:int" />
- <!-- unique id for this purchase -->
- <xsd:attribute name="symbol" type="xsd:string" />
- <xsd:attribute name="quantity" type="xsd:int" />
- <xsd:attribute name="purchaseDate" type="xsd:dateTime" />
- <xsd:attribute name="purchasePrice" type="xsd:float" />
- <xsd:attribute name="currentPrice" type="xsd:float" />
- <xsd:attribute name="company" type="xsd:string" />
- <xsd:attribute name="highPrice" type="xsd:float" />
- <xsd:attribute name="lowPrice" type="xsd:float" />
-
- </xsd:complexType>
-
- <!-- Profile in data base -->
- <xsd:element name="getCustomerProfile">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="loginID" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="CustomerProfileData">
- <xsd:sequence>
- <xsd:element name="firstName" type="xsd:string" />
- <xsd:element name="lastName" type="xsd:string" />
- <xsd:element name="address" type="xsd:string" />
- <xsd:element name="email" type="xsd:string" />
- <xsd:element name="loginID" type="xsd:string" />
- <xsd:element name="password" type="xsd:string" />
- <xsd:element name="id" type="xsd:int" />
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="getCustomerProfileResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="customerProfile"
- type="account:CustomerProfileData" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="withdraw">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="accountNumber"
- type="xsd:string" />
- <xsd:element name="amount" type="xsd:float" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="withdrawResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="balance" type="xsd:float" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="deposit">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="accountNumber"
- type="xsd:string" />
- <xsd:element name="amount" type="xsd:float" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="depositResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="balance" type="xsd:float" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="purchaseStock">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="id" type="xsd:int" />
- <xsd:element name="stock" type="account:StockSummary" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="purchaseStockResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="purchaseSummary"
- type="account:StockSummary" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
-
-
- <xsd:element name="sellStock">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="purchaseLotNumber"
- type="xsd:int" /><!-- unique id for this purchase -->
- <xsd:element name="quantity" type="xsd:int" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="createAccount">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="customerProfile"
- type="account:CustomerProfileData" />
- <xsd:element name="createSavings"
- type="xsd:boolean" />
- <xsd:element name="createCheckings"
- type="xsd:boolean" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="createAccountResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="customerProfile"
- type="account:CustomerProfileData" />
- </xsd:sequence>
- </xsd:complexType>
-
- </xsd:element>
-
- <xsd:element name="getAccountLog">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="customerID"
- type="xsd:int" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="getAccountLogResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="accountLog"
- type="account:AccountLog" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="AccountLog">
- <xsd:sequence>
- <xsd:element name="accountLogEntries"
- type="account:AccountLogEntry" maxOccurs="unbounded" />
- <xsd:element name="stockLogEntries"
- type="account:StockLogEntry" maxOccurs="unbounded" />
-
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="AccountLogEntry">
- <xsd:attribute name="logSeqNo" type="xsd:int" />
- <xsd:attribute name="id" type="xsd:int" />
- <xsd:attribute name="accountNumber" type="xsd:string" />
- <xsd:attribute name="actionType" type="xsd:string" />
- <xsd:attribute name="amount" type="xsd:float" />
- </xsd:complexType>
-
- <xsd:complexType name="StockLogEntry">
- <xsd:attribute name="logSeqNo" type="xsd:int" />
- <xsd:attribute name="id" type="xsd:int" />
- <xsd:attribute name="symbol" type="xsd:string" />
- <xsd:attribute name="quantity" type="xsd:int" />
- <xsd:attribute name="actionType" type="xsd:string" />
- <xsd:attribute name="purchaseLotNumber" type="xsd:int" />
- </xsd:complexType>
-
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="getAccountReportRequest">
- <wsdl:part element="account:getAccountReport"
- name="getAccountReportRequest" />
- </wsdl:message>
- <wsdl:message name="getAccountReportResponse">
- <wsdl:part element="account:getAccountReportResponse"
- name="getAccountReportResponse" />
- </wsdl:message>
-
- <wsdl:message name="getCustomerProfileRequest">
- <wsdl:part element="account:getCustomerProfile"
- name="getCustomerProfile" />
- </wsdl:message>
- <wsdl:message name="getCustomerProfileResponse">
- <wsdl:part element="account:getCustomerProfileResponse"
- name="getCustomerProfileResponse" />
- </wsdl:message>
-
- <wsdl:message name="withdrawRequest">
- <wsdl:part element="account:withdraw" name="withdrawRequest" />
- </wsdl:message>
-
- <wsdl:message name="withdrawResponse">
- <wsdl:part element="account:withdrawResponse"
- name="withdrawResponse" />
- </wsdl:message>
-
- <wsdl:message name="depositRequest">
- <wsdl:part element="account:deposit" name="depositRequest" />
- </wsdl:message>
-
- <wsdl:message name="depositResponse">
- <wsdl:part element="account:depositResponse"
- name="depositResponse" />
- </wsdl:message>
-
- <wsdl:message name="purchaseStockRequest">
- <wsdl:part element="account:purchaseStock"
- name="purchaseStockRequest" />
- </wsdl:message>
-
- <wsdl:message name="purchaseStockResponse">
- <wsdl:part element="account:purchaseStockResponse"
- name="purchaseStockResponse" />
- </wsdl:message>
-
- <wsdl:message name="sellStockRequest">
- <wsdl:part element="account:sellStock" name="sellStockRequest" />
- </wsdl:message>
-
- <wsdl:message name="createAccountRequest">
- <wsdl:part element="account:createAccount" name="createAccountRequest" />
- </wsdl:message>
-
- <wsdl:message name="createAccountResponse">
- <wsdl:part element="account:createAccountResponse" name="createAccountResponse" />
- </wsdl:message>
-
- <wsdl:message name="getAccountLogRequest">
- <wsdl:part element="account:getAccountLog"
- name="getAccountLogRequest" />
- </wsdl:message>
-
- <wsdl:message name="getAccountLogResponse">
- <wsdl:part element="account:getAccountLogResponse"
- name="getAccountLogResponse" />
- </wsdl:message>
-
- <wsdl:portType name="AccountService">
- <wsdl:operation name="getAccountReport">
- <wsdl:input message="account:getAccountReportRequest" />
- <wsdl:output message="account:getAccountReportResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="getCustomerProfile">
- <wsdl:input message="account:getCustomerProfileRequest" />
- <wsdl:output message="account:getCustomerProfileResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="withdraw">
- <wsdl:input message="account:withdrawRequest" />
- <wsdl:output message="account:withdrawResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="deposit">
- <wsdl:input message="account:depositRequest" />
- <wsdl:output message="account:depositResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="purchaseStock">
- <wsdl:input message="account:purchaseStockRequest" />
- <wsdl:output message="account:purchaseStockResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="sellStock">
- <wsdl:input message="account:sellStockRequest" />
- <wsdl:output message="account:purchaseStockResponse" />
- </wsdl:operation>
-
-
- <wsdl:operation name="createAccount">
- <wsdl:input message="account:createAccountRequest" />
- <wsdl:output message="account:createAccountResponse" />
- </wsdl:operation>
-
- <wsdl:operation name="getAccountLog">
- <wsdl:input message="account:getAccountLogRequest" />
- <wsdl:output message="account:getAccountLogResponse" />
- </wsdl:operation>
-
- </wsdl:portType>
-
-
-
- <wsdl:binding name="AccountServiceSOAP" type="account:AccountService">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="getAccountReport">
- <soap:operation
- soapAction="http://www.bigbank.com/account/getAccountReport" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getCustomerProfile">
- <soap:operation
- soapAction="http://www.bigbank.com/account/getCustomerProfile" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="withdraw">
- <soap:operation
- soapAction="http://www.bigbank.com/account/withdraw" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="deposit">
- <soap:operation
- soapAction="http://www.bigbank.com/account/deposit" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="purchaseStock">
- <soap:operation
- soapAction="http://www.bigbank.com/account/purchaseStock" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="sellStock">
- <soap:operation
- soapAction="http://www.bigbank.com/account/sellStock" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="createAccount">
- <soap:operation
- soapAction="http://www.bigbank.com/account/createAccount" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="getAccountLog">
- <soap:operation
- soapAction="http://www.bigbank.com/account/getAccountLog" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:binding>
- <wsdl:service name="AccountService">
- <wsdl:port binding="account:AccountServiceSOAP"
- name="AccountServiceSOAP">
- <soap:address
- location="http://localhost:8085/sample-bigbank-account/services/AccountService" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/CustomerProfile.jsp b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/CustomerProfile.jsp
deleted file mode 100644
index 2dc17a8867..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/CustomerProfile.jsp
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- --%>
-
-<HTML>
-<HEAD>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<%-- LINK href="theme/Master.css" rel="stylesheet" type="text/css" --%>
-<TITLE>BigBank- Customer Account</TITLE>
-</HEAD>
-<BODY><P><FONT size="+1">Customer Account</FONT><BR>
-<BR>
-</P>
-<FORM method="post" action="FormServlet">
-<input type="hidden" name="action" value='createAccount' />
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD>First name </TD>
- <TD width="10%"></TD>
- <TD><INPUT type="text" name="firstName" size="20"></TD>
- </TR>
- <TR>
- <TD>Last name</TD>
- <TD></TD>
- <TD><INPUT type="text" name="lastName" size="20"></TD>
- </TR>
- <TR>
- <TD>Address</TD>
- <TD></TD>
- <TD><INPUT type="text" name="address" size="36" maxlength="170"></TD>
- </TR>
- <TR>
- <TD>email</TD>
- <TD></TD>
- <TD><INPUT type="text" name="email" size="16" maxlength="39"></TD>
- </TR>
- <TR>
- <TD>&nbsp;</TD>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD>Checkings</TD>
- <TD></TD>
- <TD><INPUT type="checkbox" name="checkings" value="checkings" checked></TD>
- </TR>
- <TR>
- <TD>Savings</TD>
- <TD></TD>
- <TD><INPUT type="checkbox" name="savings" value="savings" checked></TD>
- </TR>
- <TR>
- <TD>&nbsp;</TD>
- <TD></TD>
- <TD></TD>
- </TR>
- <TR>
- <TD>Logon ID</TD>
- <TD></TD>
- <TD><INPUT type="text" name="loginID" size="20"></TD>
- </TR>
- <TR>
- <TD>Password</TD>
- <TD></TD>
- <TD><INPUT type="password" name="password" size="20"></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<INPUT type="submit" name="update" value="update">&nbsp;&nbsp;
-<INPUT type="button" name="cancel" value="cancel"></FORM>
-<P><BR>
-</P>
-</BODY>
-</HTML>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld
deleted file mode 100644
index a3d92a2e46..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" version="2.0">
- <tlibversion>1.0</tlibversion>
- <jspversion>2.0</jspversion>
- <shortname>BigBank Tags</shortname>
- <info>Tag library containing BigBank tags</info>
- <tag>
- <name>service</name>
- <tagclass>bigbank.webclient.tags.sca.ServiceTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <info>Places a reference to an SCA Service in the page context</info>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>login</name>
- <tagclass>bigbank.webclient.tags.sca.LoginBarrierTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <info>Redirects if user is not logged in</info>
- <attribute>
- <name>profile</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>url</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
-
- </tag>
- <tag>
- <name>accountStatus</name>
- <tagclass>bigbank.webclient.tags.account.AccountStatusTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <info>Accesses and iterates the account service</info>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>accountService</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>profileService</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>stockStatus</name>
- <tagclass>bigbank.webclient.tags.account.StockStatusTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <info>Accesses and iterates the stocks</info>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>accountLog</name>
- <tagclass>bigbank.webclient.tags.account.AccountLogTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <info>Accesses and iterates the accounts log</info>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>accountService</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>profileService</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>stockLog</name>
- <tagclass>bigbank.webclient.tags.account.StockLogTag</tagclass>
- <bodycontent>JSP</bodycontent>
- <info>Accesses and iterates the stocks log</info>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
-
-</taglib>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl
deleted file mode 100644
index cf42086edb..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/default.scdl
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="bigbank.webclient">
-
-
-
- <dbsdo:import.sdo xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" factory="com.bigbank.account.AccountFactory"/>
-
- <component name="LoginServiceComponent">
- <implementation.java class="bigbank.webclient.services.profile.AccountLoginServiceImpl"/>
- <reference name="accountService">AccountServiceComponent</reference>
- <reference name="profileService">ProfileServiceComponent</reference>
- </component>
-
- <property name="name" type="xsd:string">Anonymous</property>
-
- <component name="ProfileServiceComponent">
- <implementation.java class="bigbank.webclient.services.profile.ProfileServiceImpl"/>
- <property name="firstName" source="$name"/>
- </component>
-
- <component name="AccountServiceComponent">
- <implementation.java class="bigbank.webclient.services.account.AccountServiceComponentImpl"/>
- <reference name="accountService">AccountService</reference>
- </component>
-
-
- <reference name="AccountService">
- <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)" wsdli:wsdlLocation="http://www.bigbank.com/account wsdl/AccountService.wsdl" />
- <binding.ws endpoint="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"
- location="wsdl/AccountService.wsdl" />
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 398767e345..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- -->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <display-name>Tuscany Bigbank Web UI sample</display-name>
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>login.html</welcome-file>
- </welcome-file-list>
-
- <filter>
- <filter-name>TuscanyFilter</filter-name>
- <filter-class>org.apache.tuscany.runtime.webapp.TuscanyFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>TuscanyFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <context-param>
- <param-name>tuscany.online</param-name>
- <param-value>false</param-value>
- </context-param>
-
-
- <listener>
- <listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.apache.tuscany.runtime.webapp.TuscanySessionListener</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.apache.tuscany.runtime.webapp.TuscanyRequestListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>LoginServlet</servlet-name>
- <servlet-class>bigbank.webclient.ui.LoginServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>FormServlet</servlet-name>
- <servlet-class>bigbank.webclient.ui.FormServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>LoginServlet</servlet-name>
- <url-pattern>/loginAction/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>FormServlet</servlet-name>
- <url-pattern>/FormServlet/*</url-pattern>
- </servlet-mapping>
-
-
-
-
-
-
-
-
-</web-app>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountLog.jsp b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountLog.jsp
deleted file mode 100644
index 6e91a14dcc..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountLog.jsp
+++ /dev/null
@@ -1,99 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- --%>
-
- <%@ page import="com.bigbank.account.AccountLogEntry" %>
- <%@ page import="com.bigbank.account.StockLogEntry" %>
- <%@ page session="true" %>
- <%@ page autoFlush="true" %>
- <%@ taglib uri="/WEB-INF/bigbank-tags.tld" prefix="sca" %>
-
- <html>
- <title>BigBank Account and Stock Log</title>
-
- <body>
-
- Account Log
-
- <table>
- <tr>
- <td><strong>Seq</strong></td>
- <td><strong>Account</strong></td>
- <td><strong>Action</strong></td>
- <td><strong>Amount</strong></td>
- </tr>
- <sca:accountLog accountService="AccountServiceComponent" profileService="ProfileServiceComponent" id="accountlogentry">
- <tr>
- <td>
- <jsp:getProperty name="accountlogentry" property="logSeqNo"/>
- </td>
- <td>
- <jsp:getProperty name="accountlogentry" property="accountNumber"/>
- </td>
- <td>
- <jsp:getProperty name="accountlogentry" property="actionType"/>
- </td>
- <td>
- <jsp:getProperty name="accountlogentry" property="amount"/>
- </td>
- </tr>
- </sca:accountLog>
- </table>
-
-
-
- <hr/>
- Stock Log
-
- <table>
-
- <tr>
- <td><strong>Seq</strong></td>
- <td><strong>Symbol</strong></td>
- <td><strong>Quantity</strong></td>
- <td>&nbsp;&nbsp;</td> <%-- spacer --%>
- <td><strong>Action</strong></td>
- <td><strong>PurchaseLotNumber</strong></td>
- </tr>
- <sca:stockLog id="stocklogentry">
- <tr>
- <td>
- <jsp:getProperty name="stocklogentry" property="logSeqNo"/>
- </td>
- <td>
- <jsp:getProperty name="stocklogentry" property="symbol"/>
- </td>
- <td>
- <jsp:getProperty name="stocklogentry" property="quantity"/>
- </td>
- <td>&nbsp;&nbsp;</td> <%-- spacer --%>
- <td>
- <jsp:getProperty name="stocklogentry" property="actionType"/>
- </td>
-
- <td>
- <jsp:getProperty name="stocklogentry" property="purchaseLotNumber"/>
- </td>
- </tr>
- </FORM>
- </sca:stockLog>
- </table>
-
-
- </body>
- </html>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountTransaction.jsp b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountTransaction.jsp
deleted file mode 100644
index 4017834867..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/accountTransaction.jsp
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- --%>
-
-<HTML>
-<HEAD>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM Software Development Platform">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>BigBank - <%=request.getParameter("account") %> </TITLE>
-</HEAD>
-<BODY>
-<P>Account <%= request.getParameter("account") %><BR>
-<BR>
-<BR>
-</P>
-<FORM method="post" action="FormServlet">
-<input type="hidden" name="action" value='account' />
-<input type="hidden" name="account" value='<%= request.getParameter("account") %>' />
-<input type="hidden" name="actionType" value='<%=request.getParameter("transaction")%>' />
-Amount to <%=request.getParameter("transaction")%> <INPUT type="text" name="Amount" size="10"
- maxlength="10"><BR>
-<BR>
-<BR>
-<BR>
-<INPUT type="submit" name="Submit"
- value="Submit">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT type="submit"
- name="cancel" value="cancel">
-</FORM>
-</BODY>
-</HTML>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/login.html b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/login.html
deleted file mode 100644
index a1a5440a4f..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/login.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<html>
-<title>Welcome to Big Bank</title>
-
-<body>
-
-<form action="loginAction" method="post">
- <table>
- <tr>
- <td colspan="2">Please login in to access your account</td>
- </tr>
- </table>
- <table>
- <tr>
- <td>Login</td>
- <td><input type="text" name="login"/></td>
- <td><I><FONT
- size="-1" color="red">(test)</FONT></I></td>
- </tr>
- <tr>
- <td>Password</td>
- <td><input type="password" name="password"/></td>
- <td><I><FONT size="-1" color="red">(password)</FONT></I></td>
- </tr>
- <tr>&nbsp;<td></td>
- <td align="right"><input type="submit" name='login' value="login"/></td>
- <tr>&nbsp;<td></td>
- </tr>
- </table>
-</form>
-<P><BR></P>
-<HR/>
-<FORM action="CustomerProfile.jsp" method="get">
-<BR>New to Big Bank? Please open a new account with us.
-<BR/>
-<P>
-<INPUT type="submit" name="createAccount" value="Create a new account">
-
-</FORM>
-
-
-</body>
-</html>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/purchaseStock.jsp b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/purchaseStock.jsp
deleted file mode 100644
index 90c3a813b6..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/purchaseStock.jsp
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- --%>
-
-<HTML>
-<HEAD>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<TITLE>BigBank- Stock purchase</TITLE>
-</HEAD>
-<BODY><P><FONT size="+1">Stock purchase</FONT><BR>
-<BR>
-</P>
-<FORM method="post" action="FormServlet">
-<input type="hidden" name="action" value='stockPurchase' />
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD>Symbol </TD>
- <TD width="10%"></TD>
- <TD><INPUT type="text" name="symbol" size="6"></TD>
- </TR>
- <TR>
- <TD>Quantity</TD>
- <TD></TD>
- <TD><INPUT type="text" name="quantity" size="6"></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<INPUT type="submit" name="purchase" value="purchase">&nbsp;&nbsp;
-<INPUT type="submit" name="cancel" value="cancel"></FORM>
-<P><BR>
-</P>
-</BODY>
-</HTML>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/stockSale.jsp b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/stockSale.jsp
deleted file mode 100644
index a2b08f4352..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/stockSale.jsp
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- --%>
-
-<HTML>
-<HEAD>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<TITLE>BigBank- Stock sale</TITLE>
-</HEAD>
-<BODY><P><FONT size="+1">Stock sale</FONT><BR>
-<BR>
-</P>
-<FORM method="post" action="FormServlet">
-<input type="hidden" name="action" value='stockSale' />
-<input type="hidden" name="purchaseLotNumber" value='<%=request.getParameter("purchaseLotNumber")%>' />
-<TABLE border="0">
- <TBODY>
-
- <TR>
- <TD>Quantity</TD>
- <TD></TD>
- <TD><INPUT type="text" name="quantity" size="6"></TD>
- </TR>
- <TR>
- <TD></TD>
- <TD></TD>
- <TD></TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<INPUT type="submit" name="stockSale" value="sell">&nbsp;&nbsp;
-<INPUT type="submit" name="cancel" value="cancel"></FORM>
-<P><BR>
-</P>
-</BODY>
-</HTML>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/summary.jsp b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/summary.jsp
deleted file mode 100644
index f31ded242f..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/main/webapp/summary.jsp
+++ /dev/null
@@ -1,144 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- --%>
-
- <%@ page import="com.bigbank.account.AccountSummary" %>
- <%@ page import="com.bigbank.account.StockSummary" %>
- <%@ page session="true" %>
- <%@ page autoFlush="true" %>
-<%@ taglib uri="/WEB-INF/bigbank-tags.tld" prefix="sca" %>
-<sca:login profile="ProfileServiceComponent" url="login.html">
- <sca:service id="profile" name="ProfileServiceComponent"/>
-
- <html>
- <title>BigBank Account Summary</title>
-
- <body>
-
- Account Information for
- <FORM method="post" action='loginAction'>
- <jsp:getProperty name='profile' property='firstName'/>
- <jsp:getProperty name='profile' property='lastName'/>
- <input type="hidden" name="logoutHIDDEN" value='logoutHIDDEN' />
- &nbsp;&nbsp;<INPUT type="submit" name='logout' value="logout">
- <br>
- </FORM>
-
- <table>
- <tr>
- <td><strong>Account</strong></td>
- <td>&nbsp;</td>
- <td><strong>Balance</strong></td>
- </tr>
- <sca:accountStatus accountService="AccountServiceComponent" profileService="ProfileServiceComponent" id="account">
- <tr>
- <FORM method="post" action='accountTransaction.jsp'>
- <input type="hidden" name="account" value='<%=((AccountSummary)pageContext.getAttribute("account")).getAccountNumber()%>' />
- <td>
- <jsp:getProperty name="account" property="accountNumber"/>
- </td>
-
- <td>
- <jsp:getProperty name="account" property="accountType"/>
- </td>
- <td>
- <jsp:getProperty name="account" property="balance"/>
- </td>
- <td>
-
- <INPUT type="submit" name='transaction' value="deposit">
- </td>
- <td>
- <INPUT type="submit" name='transaction' value="withdraw">
- </td>
- </FORM>
- </tr>
- </sca:accountStatus>
- </table>
-
-
-
- <hr/>
- <FORM method="post" action='purchaseStock.jsp'>
- Stocks: &nbsp;&nbsp;&nbsp;&nbsp;<INPUT type="submit" name='Purchase' value="Purchase"><br/>
- </FORM>
-
- <table>
-
- <tr>
- <td><strong>Symbol</strong></td>
- <td><strong>Quantity</strong></td>
- <td><strong>Purchase Date</strong></td>
- <td>&nbsp;&nbsp;</td> <%-- spacer --%>
- <td><strong>Purchase Price</strong></td>
- <td><strong>Current Price</strong></td>
- <td><strong>Company Name</strong></td>
- <td><strong>Today High</strong></td>
- <td><strong>Today Low</strong></td>
- <td>&nbsp;&nbsp;</td> <%-- spacer --%>
- <td> <%-- sell button --%></td>
- </tr>
- <sca:stockStatus id="stocksummary">
- <FORM method="post" action='stockSale.jsp' >
- <tr>
- <td>
- <jsp:getProperty name="stocksummary" property="symbol"/>
- </td>
- <td>
- <jsp:getProperty name="stocksummary" property="quantity"/>
- </td>
- <td>
- <jsp:getProperty name="stocksummary" property="purchaseDate"/>
- </td>
- <td>&nbsp;&nbsp;</td> <%-- spacer --%>
- <td>
- <jsp:getProperty name="stocksummary" property="purchasePrice"/>
- </td>
-
- <td>
- <jsp:getProperty name="stocksummary" property="currentPrice"/>
- </td>
- <td>
- <jsp:getProperty name="stocksummary" property="company"/>
- </td>
-
- <td>
- <jsp:getProperty name="stocksummary" property="highPrice"/>
- </td>
- <td>
- <jsp:getProperty name="stocksummary" property="lowPrice"/>
- </td>
- <td>&nbsp;&nbsp;</td> <%-- spacer --%>
- <td>
- <INPUT type="submit" name='stocksale' value="sell"><br/>
- <input type="hidden" name="purchaseLotNumber" value='<%=((StockSummary)pageContext.getAttribute("stocksummary")).getPurchaseLotNumber()%>' />
- </td>
- </tr>
- </FORM>
- </sca:stockStatus>
- </table>
-
- <hr/>
- <FORM method="post" action='accountLog.jsp'>
- Account and Stock Logs: &nbsp;&nbsp;&nbsp;&nbsp;<INPUT type="submit" name='Logs' value="Logs"><br/>
- </FORM>
-
-
- </body>
- </html>
-</sca:login>
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java
deleted file mode 100644
index d5ece151de..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.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 bigbank.webclient.client;
-
-import java.util.List;
-
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountService;
-
-public class TestAccountService {
-
-
- public static void main(String[] args) throws Exception {
- CompositeContext moduleContext = CurrentCompositeContext.getContext();
-
- AccountService accountService = (AccountService) moduleContext.locateService(AccountService.class, "AccountServiceComponent");
-
- AccountReport report = accountService.getAccountReport(12345);
- List summaries = report.getAccountSummaries();
-
- System.out.println("retrieved " + summaries.size() + " summaries");
-
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java b/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
deleted file mode 100644
index 9af80e99db..0000000000
--- a/branches/sca-java-0.99/samples/old/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.webclient.client;
-
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-
-import bigbank.webclient.services.profile.LoginService;
-
-public class TestLoginService {
-
-
-
- public static void main(String[] args) throws Exception {
-
- CompositeContext moduleContext = CurrentCompositeContext.getContext();
- LoginService loginService = moduleContext.locateService(LoginService.class, "LoginServiceComponent");
-
- if (loginService.login("test", "password") == LoginService.SUCCESS) {
- System.out.println("Success");
- } else {
- System.out.println("Failure");
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/README b/branches/sca-java-0.99/samples/old/binding-echo2-extension/README
deleted file mode 100644
index 65077c5881..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/README
+++ /dev/null
@@ -1,77 +0,0 @@
-Binding Echo Sample
-===================
-This sample demonstrates how new bindings are constructed for Apache Tuscany
-SCA using the lazy-loading approach where extensions are loaded only when they
-are encountered during the processing of a composite defintion (SCDL)
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you want to try out the echo binding that this sample provides
-please see the binding-echo sample that provides the necessary client and
-application code to bring up an application that uses this binding
-
-Sample Overview
----------------
-This sample contains a implementation of an SCA binding that simply echoes back
-any messages that are sent to it.
-
-binding-echo2-extension/
- src/
- main/
- java/
- echo2/
- extension/ - The bindings model classes, runtime classes
- server/ - A dummy server that the binding is plugged into
- resources/
- META-INF/
- services/
- org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor - specifies the
- artifact processors to be loaded
- org.apache.tuscany.sca.provider.BindingProviderFactory - specifies the model classes for this binding
- test/
- java/
- echo2/ - test code
- resources/
- EchoBinding.composite - the SCA assembly used by the unit test
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-
-Building The Sample Using Ant
------------------------------
-With the binary distribution the sample can be built using Ant as
-follows
-
-cd binding-echo2-extension
-ant compile
-
-See the binding-echo sample to run a sample that uses this binding.
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd binding-echo2-extension
-mvn
-
-Maven will also test that the sample extension built properly. You should see
-the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running echo.EchoReferenceTestCase
-Returned message: foo
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.111 sec
-Running echo.EchoServiceTestCase
-Returned message: foo
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.121 sec
-
-Results :
-
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/build.xml b/branches/sca-java-0.99/samples/old/binding-echo2-extension/build.xml
deleted file mode 100644
index cfbdb1e1d6..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/build.xml
+++ /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.
--->
-<project name="binding-echo2-extension" default="compile">
- <property name="test.jar" value="sample-binding-echo2-extension.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/pom.xml b/branches/sca-java-0.99/samples/old/binding-echo2-extension/pom.xml
deleted file mode 100644
index 8d0f31dd23..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-echo2-extension</artifactId>
- <name>Apache Tuscany Echo Binding Extension Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBinding.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBinding.java
deleted file mode 100644
index d6439bfa13..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBinding.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package echo2.extension;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * Implementation of the Echo binding model.
- */
-public class EchoBinding implements Binding {
-
- private String name;
- private String uri;
-
- public String getName() {
- return name;
- }
-
- public String getURI() {
- return uri;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setURI(String uri) {
- this.uri = uri;
- }
-
- public boolean isUnresolved() {
- // The sample binding is always resolved
- return false;
- }
-
- public void setUnresolved(boolean unresolved) {
- // The sample binding is always resolved
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingInvoker.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingInvoker.java
deleted file mode 100644
index 70a6e4a43a..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingInvoker.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 echo2.extension;
-
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-/**
- * Invoker for the sample echo binding.
- */
-public class EchoBindingInvoker implements Invoker {
-
- public Message invoke(Message msg) {
- try {
- Object[] args = msg.getBody();
-
- // echo back the first parameter, a real binding would invoke some API for flowing the request
- Object result = args[0];
-
- msg.setBody(result);
-
- } catch (Exception e) {
- msg.setFaultBody(e);
- }
- return msg;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingProviderFactory.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingProviderFactory.java
deleted file mode 100644
index f750641d1d..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoBindingProviderFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package echo2.extension;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-
-/**
- * Implementation of the Echo binding model.
- */
-public class EchoBindingProviderFactory implements BindingProviderFactory<EchoBinding> {
-
- private MessageFactory messageFactory;
-
- public EchoBindingProviderFactory(ExtensionPointRegistry registry) {
- ModelFactoryExtensionPoint factories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
- this.messageFactory = factories.getFactory(MessageFactory.class);
- }
-
- public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, EchoBinding binding) {
- return new EchoReferenceBindingProvider(component, reference, binding);
- }
-
- public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, EchoBinding binding) {
- return new EchoServiceBindingProvider(component, service, binding, messageFactory);
- }
-
- public Class<EchoBinding> getModelType() {
- return EchoBinding.class;
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoReferenceBindingProvider.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoReferenceBindingProvider.java
deleted file mode 100644
index 27659f79a6..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoReferenceBindingProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package echo2.extension;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * Implementation of the Echo binding provider.
- */
-public class EchoReferenceBindingProvider implements ReferenceBindingProvider {
-
- private RuntimeComponentReference reference;
-
- public EchoReferenceBindingProvider(RuntimeComponent component,
- RuntimeComponentReference reference,
- EchoBinding binding) {
- this.reference = reference;
- }
-
- public Invoker createInvoker(Operation operation, boolean isCallback) {
- if (isCallback) {
- throw new UnsupportedOperationException();
- } else {
- return new EchoBindingInvoker();
- }
- }
-
- public InterfaceContract getBindingInterfaceContract() {
- return reference.getInterfaceContract();
- }
-
- public void start() {
- }
-
- public void stop() {
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoServiceBindingProvider.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoServiceBindingProvider.java
deleted file mode 100644
index 65ba66b5a6..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/extension/EchoServiceBindingProvider.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package echo2.extension;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-
-import echo2.server.EchoServer;
-import echo2.server.EchoServiceListener;
-
-/**
- * Implementation of the Echo binding provider.
- */
-public class EchoServiceBindingProvider implements ServiceBindingProvider {
-
- private RuntimeComponent component;
- private RuntimeComponentService service;
- private EchoBinding binding;
- private MessageFactory messageFactory;
-
- public EchoServiceBindingProvider(RuntimeComponent component,
- RuntimeComponentService service, EchoBinding binding, MessageFactory messageFactory) {
- this.component = component;
- this.service = service;
- this.binding = binding;
- this.messageFactory = messageFactory;
- }
-
- public InterfaceContract getBindingInterfaceContract() {
- return service.getInterfaceContract();
- }
-
- public void start() {
-
- RuntimeComponentService componentService = (RuntimeComponentService) service;
- RuntimeWire wire = componentService.getRuntimeWire(binding);
- InvocationChain chain = wire.getInvocationChains().get(0);
-
- // Register with the hosting server
- String uri = binding.getURI();
- EchoServer.getServer().register(uri, new EchoServiceListener(chain.getHeadInvoker(), messageFactory));
- }
-
- public void stop() {
-
- // Unregister from the hosting server
- String uri = component.getURI() + "/" + binding.getName();
- EchoServer.getServer().unregister(uri);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServer.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServer.java
deleted file mode 100644
index fff8ad564f..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServer.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package echo2.server;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A sample Echo server, showing how to integrate service bindings.
- */
-public class EchoServer {
-
- public static EchoServer server;
-
- private Map<String, EchoServiceListener> services = new HashMap<String, EchoServiceListener>();
-
- public static void start() {
- }
-
- public static void stop() {
- }
-
- public static EchoServer getServer() {
- if (server == null)
- server = new EchoServer();
- return server;
- }
-
- /**
- * Register a service under the given name.
- *
- * @param service
- * @param name
- */
- public void register(String uri, EchoServiceListener service) {
- if (services.isEmpty()) {
- start();
- }
- services.put(uri, service);
- }
-
- public void unregister(String uri) {
- services.remove(uri);
- if (services.isEmpty()) {
- stop();
- }
- }
-
- /**
- * Dispatch an incoming interaction to the corresponding service.
- *
- * @param uri
- * @param input
- * @return
- */
- public String sendReceive(String uri, String input) throws InvocationTargetException {
- return services.get(uri).sendReceive(input);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServiceListener.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServiceListener.java
deleted file mode 100644
index c0010c4ccf..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/java/echo2/server/EchoServiceListener.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 echo2.server;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-
-/**
- * The EchoService listener
- */
-public class EchoServiceListener {
- private Invoker invoker;
- private MessageFactory messageFactory;
-
- public EchoServiceListener(Invoker invoker, MessageFactory messageFactory) {
- super();
- this.invoker = invoker;
- this.messageFactory = messageFactory;
- }
-
- public String sendReceive(String input) throws InvocationTargetException {
-
- // Create a request message
- Message request = messageFactory.createMessage();
- request.setBody(new Object[] {input});
-
- // Dispatch and get the response
- Message response = invoker.invoke(request);
- Object body = response.getBody();
- if (response.isFault()) {
- throw new InvocationTargetException((Throwable)body);
- }
- return (String)body;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 6671e5d9aa..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://echo2#binding.echo,model=echo2.extension.EchoBinding
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index e487bf98da..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the binding extension
-echo2.extension.EchoBindingProviderFactory;model=echo2.extension.EchoBinding
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/Echo.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/Echo.java
deleted file mode 100644
index 4dbe0f9539..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/Echo.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 echo2;
-
-/**
- * Interface of our sample Echo service.
- *
- * @version $Rev$ $Date$
- */
-public interface Echo {
-
- String echo(String msg);
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoComponentImpl.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoComponentImpl.java
deleted file mode 100644
index 83b2db8064..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoComponentImpl.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 echo2;
-
-import org.osoa.sca.annotations.Constructor;
-import org.osoa.sca.annotations.Reference;
-
-
-/**
- * A simple client component that uses a reference with an Echo binding.
- *
- * @version $Rev$ $Date$
- */
-public class EchoComponentImpl implements Echo {
-
- private Echo echoReference;
-
- @Constructor
- public EchoComponentImpl(@Reference(name = "echoReference", required = true) Echo echoReference) {
- this.echoReference = echoReference;
- }
-
- public String echo(String msg) {
- String result = echoReference.echo(msg);
- System.out.println("Returned message: "+ result);
- return result;
- }
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoReferenceTestCase.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoReferenceTestCase.java
deleted file mode 100644
index e9a9e1590f..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoReferenceTestCase.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 echo2;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoReferenceTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private Echo service;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("EchoBinding.composite");
- service = scaDomain.getService(Echo.class, "EchoComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void testEchoBinding() {
- String result = service.echo("foo");
- assertEquals(result, "foo");
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoServiceTestCase.java b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoServiceTestCase.java
deleted file mode 100644
index 077c4fb51d..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/java/echo2/EchoServiceTestCase.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 echo2;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import echo2.server.EchoServer;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EchoServiceTestCase extends TestCase {
-
- private SCADomain scaDomain;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("EchoBinding.composite");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void testEchoBinding() throws Exception {
- String result = EchoServer.getServer().sendReceive("http://tempuri.org", "foo");
- assertEquals(result, "foo");
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/resources/EchoBinding.composite b/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/resources/EchoBinding.composite
deleted file mode 100644
index ebd79c736d..0000000000
--- a/branches/sca-java-0.99/samples/old/binding-echo2-extension/src/test/resources/EchoBinding.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample/echo2"
- xmlns:se="http://sample/echo2"
- xmlns:e="http://echo2"
- name="EchoBinding">
-
- <service name="EchoService" promote="EchoComponent">
- <interface.java interface="echo2.Echo"/>
- <e:binding.echo uri="http://tempuri.org" />
- </service>
-
- <component name="EchoComponent">
- <implementation.java class="echo2.EchoComponentImpl"/>
- </component>
-
- <reference name="EchoReference" promote="EchoComponent/echoReference">
- <interface.java interface="echo2.Echo"/>
- <e:binding.echo uri="http://tempuri.org" />
- </reference>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/README b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/README
deleted file mode 100644
index 973c13d00c..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/README
+++ /dev/null
@@ -1,87 +0,0 @@
-Implementation CRUD Sample
-==========================
-This sample demonstrates how new implementation types are constructed for
-Apache Tuscany SCA.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you want to try out the CRUD implementation type that this sample provides
-please see the implementation-crud sample that provides the necessary client
-code to bring up an application that uses this implementation extension.
-
-Sample Overview
----------------
-This sample contains a CRUD implementation type as an example of how to create
-new implementation types. Components using this implementation type always
-expose the same Create, Retrieve, Update and Delete interface. This sample
-uses a singleton ResourceManager to perform the CRUD operations but of course
-a real component would provide a real implementation.
-
-implementation-crud-extension/
- src/
- main/
- java/
- crud/ - implementation model interfaces
- backend/ - fake component implementation
- impl/ - implementations of the model interfaces
- module/ - gets the implementation-crud module registered
- with the SCA runtime
- provider/ - runtime implementation
- resources/
- META-INF/
- services/
- org.apache.sca.tuscany.sca.core.ModuleActivator - specifies the
- module activation class to call
- test/
- java/
- crud/
- CRUDTestCase.java - JUnit test case
- resources/
- crud.composite - the SCA assembly used during unit testing
-
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building The Sample Extension Using Ant
------------------------------------------
-With the binary distribution the sample extension can be built using Ant as
-follows
-
-cd implementation-crud-extension
-ant compile
-
-See the implementation-crud sample to run a sample that uses this
-implementation extension.
-
-Building The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built
-using Maven as follows.
-
-cd implementation-crud-extension
-mvn
-
-Maven will also test that the sample extension built properly. You should see
-the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running crud.CRUDTestCase
-Starting CRUDServiceComponent
-create(ABC) in tmp
-retrieve(0)
-update(0)
-retrieve(0)
-delete(0)
-retrieve(0)
-Stopping CRUDServiceComponent
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.212 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/build.xml b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/build.xml
deleted file mode 100644
index 0f1a0a2270..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/build.xml
+++ /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.
--->
-<project name="implementation-crud2-extension" default="compile">
- <property name="test.jar" value="sample-implementation-crud2-extension.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/pom.xml b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/pom.xml
deleted file mode 100644
index 3bc75bfd58..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-implementation-crud2-extension</artifactId>
- <name>Apache Tuscany CRUD Implementation Extension Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-java-xml</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/CRUD.java b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/CRUD.java
deleted file mode 100644
index 49ed376809..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/CRUD.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 crud2;
-
-/**
- * The service interface of the single CRUD service provided by CRUD components.
- */
-public interface CRUD {
-
- /**
- * Create a new resource.
- * @param resource
- * @return
- */
- String create(Object resource);
-
- /**
- * Retrieve a resource.
- * @param id
- * @return
- */
- Object retrieve(String id);
-
- /**
- * Update a resource.
- * @param id
- * @param resource
- * @return
- */
- Object update(String id, Object resource);
-
- /**
- * Delete a resource.
- * @param id
- */
- void delete(String id);
-
-}
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/backend/ResourceManager.java b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/backend/ResourceManager.java
deleted file mode 100644
index aa94cd55b6..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/backend/ResourceManager.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package crud2.backend;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A fake resource manager implementation used as a backend by the sample
- * CRUD component implementation.
- */
-public class ResourceManager {
- private static int counter;
- private static final Map<String, Object> store = new HashMap<String, Object>();
- private String directory;
-
- /**
- * Constructs a new resource manager.
- *
- * @param directory the directory where to persist resources
- */
- public ResourceManager(String directory) {
- super();
- this.directory = directory;
- }
-
- /**
- * Creates a new resource.
- *
- * @param resource
- * @return
- */
- public String createResource(Object resource) {
- System.out.println("create(" + resource + ") in " + directory);
- String key = String.valueOf(counter++);
- store.put(key, resource);
- return key;
- }
-
- /**
- * Deletes a resource.
- *
- * @param id
- */
- public void deleteResource(String id) {
- System.out.println("delete(" + id + ")");
- store.remove(id);
- }
-
- /**
- * Retrieves a resource.
- *
- * @param id
- * @return
- */
- public Object retrieveResource(String id) {
- System.out.println("retrieve(" + id + ")");
- return store.get(id);
- }
-
- /**
- * Updates a resource.
- *
- * @param id
- * @param resource
- * @return
- */
- public Object updateResource(String id, Object resource) {
- System.out.println("update(" + id + ")");
- return store.put(id, resource);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementation.java b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementation.java
deleted file mode 100644
index 0887a98df6..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementation.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package crud2.extension;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Property;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
-import crud2.CRUD;
-
-
-/**
- * The model representing a sample CRUD implementation in an SCA assembly model.
- */
-public class CRUDImplementation implements Implementation {
-
- private Service crudService;
- private String directory;
-
- /**
- * Constructs a new CRUD implementation.
- */
- public CRUDImplementation() {
-
- // CRUD implementation always provide a single service exposing
- // the CRUD Java interface, create the model representing that
- // fixed service here
-
- // Create a default service named CRUD
- AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
- crudService = assemblyFactory.createService();
- crudService.setName("CRUD");
-
- // Create a Java interface model for the CRUD Java interface
- JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
- JavaInterface javaInterface;
- try {
- javaInterface = javaFactory.createJavaInterface(CRUD.class);
- } catch (InvalidInterfaceException e) {
- throw new IllegalArgumentException(e);
- }
-
- // Create a Java interface contract model and set it
- // into the service
- JavaInterfaceContract interfaceContract = javaFactory.createJavaInterfaceContract();
- interfaceContract.setInterface(javaInterface);
- crudService.setInterfaceContract(interfaceContract);
- }
-
- public String getDirectory() {
- return directory;
- }
-
- public void setDirectory(String directory) {
- this.directory = directory;
- }
-
- public ConstrainingType getConstrainingType() {
- // The sample CRUD implementation does not support constrainingTypes
- return null;
- }
-
- public List<Property> getProperties() {
- // The sample CRUD implementation does not support properties
- return Collections.emptyList();
- }
-
- public List<Service> getServices() {
- // The sample CRUD implementation provides a single fixed CRUD service
- return Collections.singletonList(crudService);
- }
-
- public List<Reference> getReferences() {
- // The sample CRUD implementation does not support properties
- return Collections.emptyList();
- }
-
- public String getURI() {
- // The sample CRUD implementation does not have a URI
- return null;
- }
-
- public void setConstrainingType(ConstrainingType constrainingType) {
- // The sample CRUD implementation does not support constrainingTypes
- }
-
- public void setURI(String uri) {
- // The sample CRUD implementation does not have a URI
- }
-
- public boolean isUnresolved() {
- // The sample CRUD implementation is always resolved
- return false;
- }
-
- public void setUnresolved(boolean unresolved) {
- // The sample CRUD implementation is always resolved
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationInvoker.java b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationInvoker.java
deleted file mode 100644
index 3040dac612..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationInvoker.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 crud2.extension;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-import crud2.backend.ResourceManager;
-
-/**
- * Implements a target invoker for CRUD component implementations.
- *
- * The target invoker is responsible for dispatching invocations to the particular
- * component implementation logic. In this example we are simply delegating the
- * CRUD operation invocations to the corresponding methods on our fake
- * resource manager.
- */
-public class CRUDImplementationInvoker implements Invoker {
- private Operation operation;
- private ResourceManager resourceManager;
-
- public CRUDImplementationInvoker(Operation operation, ResourceManager resourceManager) {
- this.operation = operation;
- this.resourceManager = resourceManager;
- }
-
- public Message invoke(Message msg) {
- try {
- Object[] args = msg.getBody();
- Object resp = null;
-
- if (operation.getName().equals("create")) {
- resp = resourceManager.createResource(args[0]);
-
- } else if (operation.getName().equals("retrieve")) {
- resp = resourceManager.retrieveResource((String)args[0]);
-
- } else if (operation.getName().equals("update")) {
- resp = resourceManager.updateResource((String)args[0], args[1]);
-
- } else if (operation.getName().equals("delete")) {
- resourceManager.deleteResource((String)args[0]);
- }
-
- msg.setBody(resp);
- } catch (Exception e) {
- msg.setFaultBody(e.getCause());
- }
- return msg;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProvider.java b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProvider.java
deleted file mode 100644
index 1135ce75cf..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProvider.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package crud2.extension;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-import crud2.backend.ResourceManager;
-
-/**
- * The model representing a sample CRUD implementation in an SCA assembly model.
- * The sample CRUD implementation is not a full blown implementation, it only
- * supports a subset of what a component implementation can support: - a single
- * fixed service (as opposed to a list of services typed by different
- * interfaces) - a directory attribute used to specify where a CRUD component is
- * going to persist resources - no references or properties - no policy intents
- * or policy sets
- */
-public class CRUDImplementationProvider implements ImplementationProvider {
-
- private RuntimeComponent component;
- private CRUDImplementation implementation;
-
- /**
- * Constructs a new CRUD implementation.
- */
- public CRUDImplementationProvider(RuntimeComponent component, CRUDImplementation implementation) {
- this.component = component;
- this.implementation = implementation;
- }
-
- public void start() {
- System.out.println("Starting " + component.getName());
- }
-
- public void stop() {
- System.out.println("Stopping " + component.getName());
- }
-
- public Invoker createInvoker(RuntimeComponentService service, Operation operation) {
- CRUDImplementationInvoker invoker = new CRUDImplementationInvoker(operation, new ResourceManager(implementation.getDirectory()));
- return invoker;
- }
-
- public Invoker createCallbackInvoker(Operation operation) {
- CRUDImplementationInvoker invoker = new CRUDImplementationInvoker(operation, new ResourceManager(implementation.getDirectory()));
- return invoker;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProviderFactory.java b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProviderFactory.java
deleted file mode 100644
index a4d92ccedd..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/java/crud2/extension/CRUDImplementationProviderFactory.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 crud2.extension;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ImplementationProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-
-/**
- * The model representing a sample CRUD implementation in an SCA assembly model.
- * The sample CRUD implementation is not a full blown implementation, it only
- * supports a subset of what a component implementation can support: - a single
- * fixed service (as opposed to a list of services typed by different
- * interfaces) - a directory attribute used to specify where a CRUD component is
- * going to persist resources - no references or properties - no policy intents
- * or policy sets
- */
-public class CRUDImplementationProviderFactory implements ImplementationProviderFactory<CRUDImplementation> {
-
- public CRUDImplementationProviderFactory(ExtensionPointRegistry registry) {
- }
-
- public Class<CRUDImplementation> getModelType() {
- // Returns the type of model processed by this processor
- return CRUDImplementation.class;
- }
-
- public ImplementationProvider createImplementationProvider(RuntimeComponent component, CRUDImplementation implementation) {
- return new CRUDImplementationProvider(component, implementation);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 4b922f4d28..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://crud2#implementation.crud,model=crud2.extension.CRUDImplementation
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
deleted file mode 100644
index 5ac1827889..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Implementation class for the implementation extension
-crud2.extension.CRUDImplementationProviderFactory;model=crud2.extension.CRUDImplementation
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/java/crud2/CRUDTestCase.java b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/java/crud2/CRUDTestCase.java
deleted file mode 100644
index 3bc86cef80..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/java/crud2/CRUDTestCase.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package crud2;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import crud2.CRUD;
-
-/**
- * Tests the CRUD service
- */
-public class CRUDTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private CRUD crudService;
-
- /**
- * @throws java.lang.Exception
- */
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("crud2.composite");
- crudService = scaDomain.getService(CRUD.class, "CRUDServiceComponent");
-
- }
-
- /**
- * @throws java.lang.Exception
- */
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
-
- public void testCRUD() throws Exception {
- String id = crudService.create("ABC");
- Object result = crudService.retrieve(id);
- assertEquals("ABC", result);
- crudService.update(id, "EFG");
- result = crudService.retrieve(id);
- assertEquals("EFG", result);
- crudService.delete(id);
- result = crudService.retrieve(id);
- assertNull(result);
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/resources/crud2.composite b/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/resources/crud2.composite
deleted file mode 100644
index 5aa4b3c7d6..0000000000
--- a/branches/sca-java-0.99/samples/old/implementation-crud2-extension/src/test/resources/crud2.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample/crud"
- xmlns:sc="http://sample/crud"
- xmlns:c="http://crud2"
- name="crud2">
-
- <component name="CRUDServiceComponent">
- <c:implementation.crud directory="tmp" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/build-bundles.xml b/branches/sca-java-0.99/samples/osgi-supplychain/build-bundles.xml
deleted file mode 100644
index 7a31e6016b..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/build-bundles.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="OSGiBundleCreator">
-
- <target name="create-bundles">
-
- <jar jarfile="${jar.dir}/${jar.file.name}" manifest="${files.dir}/${manifest.file.name}" >
- <fileset dir="${files.dir}" includes="${files.list}">
- <!-- include name="${files.list}"/-->
- </fileset>
- </jar>
- </target>
-
-
-</project>
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/pom.xml b/branches/sca-java-0.99/samples/osgi-supplychain/pom.xml
deleted file mode 100644
index 6cfa54796e..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/pom.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-osgi-supplychain</artifactId>
- <name>Apache Tuscany OSGi Supply Chain Sample</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-osgi</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>sample-osgi-supplychain</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
-
- <executions>
- <execution>
- <id>create-bundles</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="Customer.jar" />
- <property name="manifest.file.name" value="osgi/Customer.mf" />
- <property name="files.list"
- value="supplychain/customer/Customer.class \
- supplychain/OSGiBundleImpl.class \
- supplychain/customer/OSGiCustomerImpl.class" />
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="Retailer.jar" />
- <property name="manifest.file.name" value="osgi/Retailer.mf" />
- <property name="files.list"
- value="supplychain/retailer/Retailer.class \
- supplychain/OSGiBundleImpl.class \
- supplychain/retailer/OSGiRetailerImpl.class" />
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="Shipper.jar" />
- <property name="manifest.file.name" value="osgi/Shipper.mf" />
- <property name="files.list"
- value="supplychain/shipper/Shipper.class \
- supplychain/OSGiBundleImpl.class \
- supplychain/shipper/OSGiShipperImpl.class" />
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="Warehouse.jar" />
- <property name="manifest.file.name" value="osgi/Warehouse.mf" />
- <property name="files.list"
- value="supplychain/warehouse/Warehouse.class \
- supplychain/OSGiBundleImpl.class \
- supplychain/warehouse/OSGiWarehouseImpl.class" />
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="DSCustomer.jar" />
- <property name="manifest.file.name" value="osgi/ds/Customer.mf" />
- <property name="files.list"
- value="supplychain/customer/Customer.class \
- osgi/ds/Customer.xml \
- supplychain/customer/OSGiCustomerComponentImpl.class" />
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="DSRetailer.jar" />
- <property name="manifest.file.name" value="osgi/ds/Retailer.mf" />
- <property name="files.list"
- value="supplychain/retailer/Retailer.class \
- osgi/ds/Retailer.xml \
- supplychain/retailer/OSGiRetailerComponentImpl.class" />
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="DSShipper.jar" />
- <property name="manifest.file.name" value="osgi/ds/Shipper.mf" />
- <property name="files.list"
- value="supplychain/shipper/Shipper.class \
- osgi/ds/Shipper.xml \
- supplychain/shipper/OSGiShipperComponentImpl.class" />
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target" />
- <property name="files.dir" value="target/classes" />
- <property name="jar.file.name" value="DSWarehouse.jar" />
- <property name="manifest.file.name" value="osgi/ds/Warehouse.mf" />
- <property name="files.list"
- value="supplychain/warehouse/Warehouse.class \
- osgi/ds/Warehouse.xml \
- supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
-
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/readme.htm b/branches/sca-java-0.99/samples/osgi-supplychain/readme.htm
deleted file mode 100644
index f6948ab471..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/readme.htm
+++ /dev/null
@@ -1,332 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
- <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
- <meta http-equiv="Content-Style-Type" content="text/css">
- <title>Tuscany Supply Chain</title>
-<!-- LINK rel="stylesheet" href="ait.css" type="text/css" -->
- <style type="text/css" media="all">
-@import url("../../../../css/maven-base.css");
-@import url("../../../../css/maven-theme.css");
-@import url("../../../../css/site.css");
- </style>
- <link rel="stylesheet" href="./css/print.css" type="text/css"
- media="print">
-</head>
-<body>
-<h2>Tuscany
-Supply Chain Sample using OSGi<br>
-</h2>
-<h3>Overview</h3>
-<p>The Tuscany OSGi supply chain sample shows using the Tuscany SCA
-runtime in a J2SE environment&nbsp;executing the SCA asynchronous API
-with OSGi and Java implementation types.</p>
-<h3>Location</h3>
-This
-sample is located &nbsp;in the samples\osgi-supplychain directory.<br>
-<h3>Setup</h3>
-This sample depends on the Tuscany runtime
-and the sample jar, <span style="font-weight: bold;"></span>both of
-these must be available on the classpath to run the sample.
-<h3>Running</h3>
-In the directory&nbsp;samples\osgi-supplychain
-use the JDK 1.5 java command to run the class <span
- style="font-weight: bold;">supplychain.SupplyChainClient</span>
-<pre>Linux: java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-osgi-supplychain.jar supplychain.SupplyChainClient</pre>
-<pre>Windows: java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-osgi-supplychain.jar supplychain.SupplyChainClient</pre>
-<h3>Results</h3>
-<p>The sample when run should simply display on the standard output
-some startup messages followed by:<br>
-<br>
-Work thread Thread[Thread-1,5,main]
-- <span style="font-weight: bold;">Order, submitted, fulfilled, shipped</span><code></code></p>
-<h3>Code Overview</h3>
-The source files are physically organized as shown below:
-<table style="text-align: left; width: 100%;" border="1" cellpadding="2"
- cellspacing="2">
- <tbody>
- <tr>
- <td>src<br>
-+---main<br>
-&nbsp;&nbsp;&nbsp;
-+---java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp; +---supplychain<br>
-&nbsp;&nbsp;&nbsp; &brvbar;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; OSGiBundleImpl.java<br>
-&nbsp;&nbsp;&nbsp; &brvbar;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; SupplyChainClient.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; +---customer<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;
-&nbsp; &nbsp;
-Customer.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-JavaCustomerComponentImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-OSGiCustomerComponentImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-OSGiCustomerImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; +---retailer<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;
-&nbsp; &nbsp;
-Retailer.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-JavaRetailerComponentImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-OSGiRetailerComponentImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-OSGiRetailerImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; +---shipper<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Shipper.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-JavaShipperComponentImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-OSGiShipperComponentImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-OSGiShipperImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; +---warehouse<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Warehouse.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-JavaWarehouseComponentImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-OSGiWarehouseComponentImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-OSGiWarehouseImpl.java<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;<br>
-&nbsp;&nbsp;&nbsp; +---resources<br>
-&nbsp;&nbsp;&nbsp;
-&brvbar;&nbsp;&nbsp; +---osgi<br>
-&nbsp;&nbsp;&nbsp; &brvbar;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Customer.mf<br>
-&nbsp;&nbsp;&nbsp; &brvbar;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Retailer.mf<br>
-&nbsp;&nbsp;&nbsp; &brvbar;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Shipper.mf<br>
-&nbsp;&nbsp;&nbsp; &brvbar;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Warehouse.mf<br>
-&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-+---ds<br>
-&nbsp;&nbsp;&nbsp; &brvbar; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp; &nbsp; &nbsp; Customer.mf<br>
-&nbsp;&nbsp;&nbsp; &brvbar; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;
-&nbsp; &nbsp;&nbsp; Retailer.mf<br>
-&nbsp;&nbsp;&nbsp; &brvbar;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Shipper.mf<br>
-&nbsp;&nbsp;&nbsp; &brvbar;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Warehouse.mf<br>
-&nbsp;&nbsp;&nbsp; &brvbar; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp; &nbsp; &nbsp; Customer.xml<br>
-&nbsp;&nbsp;&nbsp; &brvbar; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;
-&nbsp; &nbsp;&nbsp; Retailer.xml<br>
-&nbsp;&nbsp;&nbsp; &brvbar;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Shipper.xml<br>
-&nbsp;&nbsp;&nbsp; &brvbar;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Warehouse.xml<br>
-&nbsp;&nbsp;&nbsp; &brvbar; &nbsp;&nbsp;&nbsp;&nbsp;
-Customer.componentType<br>
-&nbsp;&nbsp;&nbsp; &brvbar; &nbsp;&nbsp;&nbsp;&nbsp;
-Retailer.componentType<br>
-&nbsp;&nbsp;&nbsp; &brvbar; &nbsp;&nbsp;&nbsp;&nbsp;
-Shipper.componentType<br>
-&nbsp;&nbsp;&nbsp; &brvbar; &nbsp;&nbsp;&nbsp;&nbsp;
-Warehouse.componentType<br>
-&nbsp;&nbsp;&nbsp; &brvbar; &nbsp;&nbsp;&nbsp;&nbsp;
-supplychain.composite<br>
-&nbsp;&nbsp;&nbsp; &brvbar; &nbsp;&nbsp;&nbsp;&nbsp;
-supplychain.ds.composite<br>
-&nbsp;&nbsp; <br>
- <br>
- </td>
- </tr>
- </tbody>
-</table>
-<br>
-<table style="text-align: left; width: 879px; height: 154px;" border="0"
- cellpadding="2" cellspacing="2">
- <tbody>
- <tr>
- <td style="vertical-align: top;">Customer.java</td>
- <td>Defines the Java interface implemented by the Customer
-component.</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">JavaCustomerComponentImpl.java</td>
- <td>POJO Implementation of the SCA Customer component.</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">OSGiCustomerComponentImpl.java</td>
- <td style="vertical-align: top;">OSGi Declarative Services
-Implementation of the SCA Customer component.</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">OSGiCustomerImpl.java</td>
- <td style="vertical-align: top;">OSGi Procedural Services
-Implementation of the SCA Customer component.</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">Retailer.java</td>
- <td>Defines the Java interface implemented by the Retailer
-component.</td>
- </tr>
- <tr>
- <td>JavaRetailerComponentImpl.java</td>
- <td>POJO Implementation of&nbsp; the SCA&nbsp;RetailerComponent
-component.</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">OSGiRetailerComponentImpl.java</td>
- <td style="vertical-align: top;">OSGi Declarative Services
-Implementation of the SCA Retailer component.</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">OSGiRetailerImpl.java</td>
- <td style="vertical-align: top;">OSGi Procedural Services
-Implementation of the SCA Retailer component.</td>
- </tr>
- <tr>
- <td>Shipper.java</td>
- <td>Defines
-the Java interface implemented by the&nbsp;Shipper component</td>
- </tr>
- <tr>
- <td>JavaShipperComponentImpl.java</td>
- <td>POJO Implementation of the SCA&nbsp;ShipperComponent
-component.</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">OSGiShipperComponentImpl.java</td>
- <td style="vertical-align: top;">OSGi Declarative Services
-Implementation of the SCA Shipper component.</td>
- </tr>
- <tr>
- <td>OSGiShipperImpl.java</td>
- <td>OSGi Procedural Services Implementation of the SCA Shipper
-component.</td>
- </tr>
- <tr>
- <td>Warehouse.java</td>
- <td>Defines
-the Java interface implemented by the&nbsp;Warehouse component.</td>
- </tr>
- <tr>
- <td>JavaWarehouseComponentImpl.java</td>
- <td>POJO Implementation of the SCA&nbsp;WarehouseComponent
-component.</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">OSGiWarehouseComponentImpl.java</td>
- <td style="vertical-align: top;">OSGi Declarative Services
-Implementation of the SCA Warehouse component.</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">OSGiWarehouseImpl.java</td>
- <td style="vertical-align: top;">OSGi Procedural Services
-Implementation of the SCA Warehouse component.</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">OSGiBundleImpl.java<br>
- </td>
- <td style="vertical-align: top;">Common code for OSGi Procedural
-Services Implementation of the SCA components<br>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top;">SupplyChainClient.java</td>
- <td style="vertical-align: top;">SupplyChainClient.java
-loads SCA runtime <br>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top;">SupplyChainClientTestCase.java</td>
- <td style="vertical-align: top;">JUnit test for this sample<br>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top;">resources/osgi/*.mf<br>
- </td>
- <td style="vertical-align: top;">Manifest files for OSGi bundles
-for OSGi procedural services implementation<br>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top;">resources/osgi/ds/*.mf</td>
- <td style="vertical-align: top;">Manifest files for OSGi bundles
-for OSGi declarative services implementation</td>
- </tr>
- <tr>
- <td style="vertical-align: top;">resources/osgi/ds/*.xml</td>
- <td style="vertical-align: top;">OSGi Declarative services
-component xml files<br>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top;">resources/*.componentType<br>
- </td>
- <td style="vertical-align: top;">Component types used by OSGi
-implementation provider for SCA<br>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top;">resources/supplychain.composite<br>
- </td>
- <td style="vertical-align: top;">Composite file using OSGi and
-Java implementation types<br>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top;">resources/supplychain.ds.composite</td>
- <td style="vertical-align: top;">Composite file using OSGi
-(declarative services) and Java implementation types <br>
- </td>
- </tr>
- </tbody>
-</table>
-<br>
-</body>
-</html>
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
deleted file mode 100644
index d357c622c3..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.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 supplychain;
-
-
-import java.lang.reflect.Field;
-import java.util.Hashtable;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceEvent;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-
-/**
- * Common code for all OSGi bundles which dont use declarative services.
- * Registers services and sets references.
- */
-public class OSGiBundleImpl implements ServiceListener, BundleActivator {
-
-
- String name;
- String serviceName;
- String[] references;
- Class<?>[] referenceClasses;
- Field[] referenceFields;
-
- Class myClass;
-
- private BundleContext bundleContext;
-
- public OSGiBundleImpl(String serviceName, String... references) {
-
- System.out.println("Created " + this.getClass().getSimpleName());
-
- myClass = this.getClass();
- this.name = this.getClass().getSimpleName();
- this.serviceName = serviceName;
- this.references = references;
-
- try {
- referenceClasses = new Class[references.length];
- referenceFields = new Field[references.length];
- for (int i = 0; i < references.length; i++) {
- referenceFields[i] = this.getClass().getDeclaredField(references[i]);
- referenceFields[i].setAccessible(true);
- referenceClasses[i] = referenceFields[i].getType();
- }
-
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- }
-
- public void start(BundleContext bc) {
-
- System.out.println("Started bundle " + name);
-
- this.bundleContext = bc;
-
- bundleContext.registerService(serviceName, this, new Hashtable());
-
- for (int i = 0; i < references.length; i++) {
-
- try {
-
- ServiceReference ref = bundleContext.getServiceReference(referenceClasses[i].getName());
- if (ref != null) {
- Object obj = bundleContext.getService(ref);
- referenceFields[i].set(this, referenceClasses[i].cast(obj));
- } else {
- String filter = "(objectclass=" + referenceClasses[i].getName() + ")";
- this.bundleContext.addServiceListener(this, filter);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- public void stop(BundleContext bc) {
- System.out.println("Stop bundle " + name);
-
- }
-
-
- public void serviceChanged(ServiceEvent event) {
- try {
- if (event.getType() == ServiceEvent.REGISTERED) {
-
- ServiceReference ref = event.getServiceReference();
- Object obj = bundleContext.getService(ref);
- for (int i = 0; i < references.length; i++) {
- if (referenceClasses[i].isAssignableFrom(obj.getClass())) {
- referenceFields[i].set(this, referenceClasses[i].cast(obj));
- }
- }
- }
- } catch (Throwable e) {
- e.printStackTrace();
- }
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
deleted file mode 100644
index 64814487cb..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.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 supplychain;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import supplychain.customer.Customer;
-
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate a Customer service component and invoke it.
- */
-public class SupplyChainClient {
-
- public static final void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("supplychain.composite");
- Customer customer = scaDomain.getService(Customer.class, "CustomerComponent");
-
- System.out.println("Main thread " + Thread.currentThread());
- customer.purchaseGoods();
- System.out.println("Main thread sleeping ...");
- Thread.sleep(1000);
-
- scaDomain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 225dce0236..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.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 supplychain.customer;
-
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-
- public void purchaseGoods();
-
- @OneWay
- public void notifyShipment(String order);
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index 447efbae6e..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.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 supplychain.customer;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-
- private Retailer retailer;
-
- @Reference
- public void setRetailer(Retailer retailer) {
- this.retailer = retailer;
- }
-
- public void purchaseGoods() {
- System.out.println("Customer.purchaseGoods, retailer is " + retailer);
- retailer.submitOrder("Order");
- }
-
- public void notifyShipment(String order) {
- System.out.print("Work thread " + Thread.currentThread() + " - ");
- System.out.println(order);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
deleted file mode 100644
index 580e1289b7..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.customer;
-
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi declarative services implementation).
- */
-public class OSGiCustomerComponentImpl implements Customer {
-
-
- private Retailer retailer;
-
-
- protected void setRetailer(Retailer retailer) {
- this.retailer = retailer;
- }
-
- protected void unsetRetailer(Retailer retailer) {
- this.retailer = null;
- }
-
- public void purchaseGoods() {
- System.out.println("Customer.purchaseGoods, retailer is " + retailer);
- retailer.submitOrder("Order");
- }
-
- public void notifyShipment(String order) {
- System.out.print("Work thread " + Thread.currentThread() + " - ");
- System.out.println(order);
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
deleted file mode 100644
index e1557bc6d8..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.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 supplychain.customer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (OSGi procedural services implementation).
- */
-public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
-
- private Retailer retailer;
-
- public OSGiCustomerImpl() {
- super("supplychain.customer.Customer", "retailer");
-
- }
-
- public void purchaseGoods() {
- System.out.println("Customer.purchaseGoods, retailer is " + retailer);
- retailer.submitOrder("Order");
- }
-
- public void notifyShipment(String order) {
- System.out.print("Work thread " + Thread.currentThread() + " - ");
- System.out.println(order);
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index 7a8caaafe3..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.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 supplychain.retailer;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-
- private Warehouse warehouse;
-
-
- @Reference
- public void setWarehouse(Warehouse warehouse) {
- this.warehouse = warehouse;
- }
-
-
- public void submitOrder(String order) {
-
- System.out.println("Retailer.submitOrder, warehouse is " + warehouse);
- warehouse.fulfillOrder(order + ", submitted");
-
- }
-
-
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
deleted file mode 100644
index 2112043613..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.retailer;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi declarative services implementation).
- */
-public class OSGiRetailerComponentImpl implements Retailer {
-
- private Warehouse warehouse;
-
-
- protected void setWarehouse(Warehouse warehouse) {
- this.warehouse = warehouse;
- }
-
- protected void unsetWarehouse(Warehouse warehouse) {
- this.warehouse = null;
- }
-
- public void submitOrder(String order) {
-
- System.out.println("Retailer.submitOrder, warehouse is" + warehouse);
- warehouse.fulfillOrder(order + ", submitted");
-
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
deleted file mode 100644
index f8f86b418c..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.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 supplychain.retailer;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (OSGi procedural services implementation).
- */
-public class OSGiRetailerImpl extends OSGiBundleImpl implements Retailer {
-
- private Warehouse warehouse;
-
- public OSGiRetailerImpl() {
-
- super("supplychain.retailer.Retailer", "warehouse");
- }
-
- public void submitOrder(String order) {
-
- System.out.println("Retailer.submitOrder, warehouse is " + warehouse);
- warehouse.fulfillOrder(order + ", submitted");
-
- }
-
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-
- public void submitOrder(String order);
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index d0fb30fc04..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.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 supplychain.shipper;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-
- private Customer customer;
-
- @Reference
- public void setCustomer(Customer customer) {
- this.customer = customer;
- }
-
- public void processShipment(String order) {
- System.out.println("Shipper.processShipment, customer is " + customer);
- customer.notifyShipment(order + ", shipped");
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
deleted file mode 100644
index 8278e2957f..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.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 supplychain.shipper;
-
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi declarative services implementation).
- */
-public class OSGiShipperComponentImpl implements Shipper {
-
- private Customer customer;
-
-
- protected void setCustomer(Customer customer) {
- this.customer = customer;
- }
-
- protected void unsetCustomer(Customer customer) {
- this.customer = null;
- }
-
- public void processShipment(String order) {
- System.out.println("Shipper.processShipment, customer is " + customer);
- customer.notifyShipment(order + ", shipped");
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
deleted file mode 100644
index 4eaa14e4db..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.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 supplychain.shipper;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (OSGi procedural services implementation).
- */
-public class OSGiShipperImpl extends OSGiBundleImpl implements Shipper {
-
- private Customer customer;
-
- public OSGiShipperImpl() {
- super("supplychain.shipper.Shipper", "customer");
- }
-
-
- public void processShipment(String order) {
- System.out.println("Shipper.processShipment, customer is " + customer);
- customer.notifyShipment(order + ", shipped");
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-
- public void processShipment(String order);
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index bf153b481c..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.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 supplychain.warehouse;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Service(Warehouse.class)
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-
- private Shipper shipper;
-
-
- @Reference
- public void setShipper(Shipper shipper) {
- this.shipper = shipper;
- }
-
- public void fulfillOrder(String order) {
- System.out.println("Warehouse.fulfillOrder : shipper is " + shipper);
-
- shipper.processShipment(order + ", fulfilled");
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
deleted file mode 100644
index 63e5725a43..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.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 supplychain.warehouse;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (OSGi declarative services implementation).
- */
-
-public class OSGiWarehouseComponentImpl implements Warehouse {
-
- private Shipper shipper;
-
-
- protected void setShipper(Shipper shipper) {
- this.shipper = shipper;
- }
-
- protected void unsetShipper(Shipper shipper) {
- this.shipper = null;
- }
-
- public void fulfillOrder(String order) {
- System.out.println("Warehouse.fulfillOrder : shipper is " + shipper);
-
- shipper.processShipment(order + ", fulfilled");
-
- }
-
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
deleted file mode 100644
index 27f95c1752..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.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 supplychain.warehouse;
-
-
-import supplychain.OSGiBundleImpl;
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service componentm (OSGi procedural services implementation).
- */
-
-public class OSGiWarehouseImpl extends OSGiBundleImpl implements Warehouse {
-
- private Shipper shipper;
-
- public OSGiWarehouseImpl() {
- super("supplychain.warehouse.Warehouse", "shipper");
- }
-
-
- public void fulfillOrder(String order) {
- System.out.println("Warehouse.fulfillOrder : shipper is " + shipper);
-
- shipper.processShipment(order + ", fulfilled");
-
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-
- public void fulfillOrder(String order);
-
-}
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Customer.componentType b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Customer.componentType
deleted file mode 100644
index 5c61a0961c..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Customer.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <service name="supplychain.customer.Customer">
- <interface.java interface="supplychain.customer.Customer"/>
- </service>
- <reference name="retailer">
- <interface.java interface="supplychain.retailer.Retailer"/>
- </reference>
-
-</componentType> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +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, serviceDefinition 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-0.99/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index d83ebbe236..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,14 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2006 The Apache Software Foundation
-
-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.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/README.txt b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/README.txt
deleted file mode 100644
index 9b26d1690a..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/META-INF/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M1 build (May, 2006)
-===================================
-
-http://incubator.apache.org/tuscany/
-
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the 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.
-
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list
-or in the JIRA issue tracker.
-
-Mailing list subscription:
- tuscany-dev-subscribe@ws.apache.org
-
-Jira:
- http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team.
-
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Retailer.componentType
deleted file mode 100644
index 15185f2bf9..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Retailer.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <service name="supplychain.retailer.Retailer">
- <interface.java interface="supplychain.retailer.Retailer"/>
- </service>
- <reference name="warehouse">
- <interface.java interface="supplychain.warehouse.Warehouse"/>
- </reference>
-
-</componentType> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Shipper.componentType
deleted file mode 100644
index 675597d80b..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Shipper.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <service name="supplychain.shipper.Shipper">
- <interface.java interface="supplychain.shipper.Shipper"/>
- </service>
- <reference name="customer">
- <interface.java interface="supplychain.customer.Customer"/>
- </reference>
-
-</componentType> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
deleted file mode 100644
index 6e1ac3e5a9..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <service name="supplychain.warehouse.Warehouse">
- <interface.java interface="supplychain.warehouse.Warehouse"/>
- </service>
-
- <reference name="shipper">
- <interface.java interface="supplychain.shipper.Shipper"/>
- </reference>
-</componentType> \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
deleted file mode 100644
index 88d79e5219..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.retailer
-Export-Package: supplychain.customer
-Bundle-Activator: supplychain.customer.OSGiCustomerImpl
-
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
deleted file mode 100644
index d95ef5d582..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Bundle-Activator: supplychain.retailer.OSGiRetailerImpl
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
deleted file mode 100644
index de7ac7ec7a..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.customer
-Export-Package: supplychain.shipper
-Bundle-Activator: supplychain.shipper.OSGiShipperImpl
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
deleted file mode 100644
index 21241a6899..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: supplychain.warehouse.Warehouse
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- supplychain.shipper
-Export-Package: supplychain.warehouse
-Bundle-Activator: supplychain.warehouse.OSGiWarehouseImpl
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
deleted file mode 100644
index b5c5a862be..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Customer
-Bundle-SymbolicName: ds.supplychain.customer.Customer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.retailer
-Export-Package: supplychain.customer
-Service-Component: osgi/ds/Customer.xml
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
deleted file mode 100644
index 961b22b3c7..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<component name="CustomerComponent" immediate="true">
- <implementation class="supplychain.customer.OSGiCustomerComponentImpl" />
- <service>
- <provide interface="supplychain.customer.Customer" />
- </service>
- <reference
- name="retailer"
- interface="supplychain.retailer.Retailer"
- bind="setRetailer"
- unbind="unsetRetailer"
- target="(component.name=RetailerComponent)"
- policy="dynamic"
- />
-</component>
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
deleted file mode 100644
index 47897d16ca..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Retailer
-Bundle-SymbolicName: ds.supplychain.retailer.Retailer
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.warehouse
-Export-Package: supplychain.retailer
-Service-Component: osgi/ds/Retailer.xml
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
deleted file mode 100644
index dc4c39b549..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<component name="RetailerComponent" immediate="true" >
- <implementation class="supplychain.retailer.OSGiRetailerComponentImpl" />
- <service>
- <provide interface="supplychain.retailer.Retailer" />
- </service>
- <reference
- name="warehouse"
- interface="supplychain.warehouse.Warehouse"
- bind="setWarehouse"
- unbind="unsetWarehouse"
- target="(component.name=WarehouseComponent)"
- policy="dynamic"
- />
-</component>
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
deleted file mode 100644
index f5333c7caa..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Shipper
-Bundle-SymbolicName: ds.supplychain.shipper.Shipper
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component, supplychain.customer
-Export-Package: supplychain.shipper
-Service-Component: osgi/ds/Shipper.xml
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
deleted file mode 100644
index b05f23c7cc..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<component name="ShipperComponent" immediate="true">
- <implementation class="supplychain.shipper.OSGiShipperComponentImpl" />
- <service>
- <provide interface="supplychain.shipper.Shipper"/>
- </service>
- <reference
- name="customer"
- interface="supplychain.customer.Customer"
- bind="setCustomer"
- unbind="unsetCustomer"
- target="(component.name=CustomerComponent)"
- cardinality="0..1"
- policy="dynamic"
- />
-</component>
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
deleted file mode 100644
index 6166549e5a..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Warehouse
-Bundle-SymbolicName: ds.supplychain.warehouse.Warehouse
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Import-Package: org.osgi.framework,
- org.osgi.service.component,
- supplychain.shipper
-Export-Package: supplychain.warehouse
-Service-Component: osgi/ds/Warehouse.xml
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
deleted file mode 100644
index dcbbc2b543..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<component name="WarehouseComponent" immediate="true">
- <implementation class="supplychain.warehouse.OSGiWarehouseComponentImpl" />
- <service>
- <provide interface="supplychain.warehouse.Warehouse"/>
- </service>
- <reference
- name="shipper"
- interface="supplychain.shipper.Shipper"
- bind="setShipper"
- unbind="unsetShipper"
- target="(component.name=ShipperComponent)"
- policy="dynamic"
- />
-</component>
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.composite b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.composite
deleted file mode 100644
index 3afcb88c58..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.composite
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <tuscany:implementation.osgi
- bundle="Customer"
- bundleLocation="file:target/Customer.jar"
- scope="COMPOSITE"
- />
-
- <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" -->
- <reference name="retailer" target="RetailerComponent" />
- </component>
-
- <component name="RetailerComponent">
- <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />
- <!--implementation.osgi
- bundle="Retailer"
- bundleLocation="file:target/Retailer.jar"
- /-->
- <reference name="warehouse" target="WarehouseComponent"/>
- </component>
-
- <component name="WarehouseComponent">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
- <!--implementation.osgi
- bundle="Warehouse"
- bundleLocation="file:target/Warehouse.jar"
- /-->
- <reference name="shipper" target="ShipperComponent" />
- </component>
-
- <component name="ShipperComponent">
- <tuscany:implementation.osgi
- bundle="Shipper"
- bundleLocation="file:target/Shipper.jar"
- />
- <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->
- <reference name="customer" target="CustomerComponent" />
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
deleted file mode 100644
index 72ea783ea7..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <tuscany:implementation.osgi
- bundle="Customer"
- bundleLocation="file:target/DSCustomer.jar"
- scope="COMPOSITE"
- />
-
- <!--implementation.java class="supplychain.customer.JavaCustomerComponentImpl" -->
- <reference name="retailer" target="RetailerComponent" />
- </component>
-
- <component name="RetailerComponent">
- <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" />
- <!--implementation.osgi
- bundle="Retailer"
- bundleLocation="file:target/DSRetailer.jar"
- /-->
- <reference name="warehouse" target="WarehouseComponent"/>
- </component>
-
- <component name="WarehouseComponent">
- <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" />
- <!--implementation.osgi
- bundle="Warehouse"
- bundleLocation="file:target/DSWarehouse.jar"
- /-->
- <reference name="shipper" target="ShipperComponent" />
- </component>
-
- <component name="ShipperComponent">
- <tuscany:implementation.osgi
- bundle="Shipper"
- bundleLocation="file:target/DSShipper.jar"
- />
- <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /-->
- <reference name="customer" target="CustomerComponent" />
- </component>
-
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/branches/sca-java-0.99/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
deleted file mode 100644
index ba166cea00..0000000000
--- a/branches/sca-java-0.99/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-
-import supplychain.customer.Customer;
-
-/**
- * This client program shows how to create an SCA runtime, start it, locate a simple HelloWorld service component and
- * invoke it.
- */
-public class SupplyChainClientTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private Customer customer;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("supplychain.composite");
- customer = scaDomain.getService(Customer.class, "CustomerComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
-
- public void test() throws Exception {
-
-
- System.out.println("In SupplyChainClientTestCase.test: Calling customer.purchaseGoods, customer is " + customer);
-
- customer.purchaseGoods();
-
- System.out.println("Sleeping ...");
- Thread.sleep(2000);
- System.out.println("Test complete");
-
- }
-
-
-}
diff --git a/branches/sca-java-0.99/samples/pom.xml b/branches/sca-java-0.99/samples/pom.xml
deleted file mode 100644
index 1ecf20384f..0000000000
--- a/branches/sca-java-0.99/samples/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-samples</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Samples</name>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>binding-echo</module>
- <module>binding-echo-extension</module>
- <module>binding-notification-broker</module>
- <module>binding-notification-consumer</module>
- <module>binding-notification-producer</module>
- <module>calculator</module>
- <module>calculator-distributed</module>
- <module>calculator-rmi-reference</module>
- <module>calculator-rmi-service</module>
- <module>calculator-script</module>
- <module>calculator-webapp</module>
- <module>calculator-webapp-ws</module>
- <module>chat-webapp</module>
- <module>databinding-echo</module>
- <module>feed-aggregator</module>
- <module>helloworld-dojo</module>
- <module>helloworld-jsonrpc</module>
- <module>helloworld-ws-service</module>
- <module>helloworld-ws-reference</module>
- <module>helloworld-ws-sdo</module>
- <module>implementation-composite</module>
- <module>implementation-crud</module>
- <module>implementation-crud-extension</module>
- <module>implementation-notification</module>
- <module>implementation-pojo-extension</module>
- <module>loanapplication</module>
- <module>osgi-supplychain</module>
- <!--
- <module>quote-xquery</module>
- -->
- <module>simple-bigbank</module>
- <module>simple-bigbank-spring</module>
- <module>simple-callback</module>
- <module>simple-callback-ws</module>
- <module>supplychain</module>
- <module>web-resource</module>
- </modules>
- </profile>
-
- </profiles>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/quote-xquery/pom.xml b/branches/sca-java-0.99/samples/quote-xquery/pom.xml
deleted file mode 100644
index 387a25eaea..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/pom.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-quote-xquery</artifactId>
- <name>Apache Tuscany XQuery Quote Implementation Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-xquery</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-lib</artifactId>
- <version>1.0-incubating</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>8.9</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-http-jetty</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>compile</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/sdo-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating</version>
- <executions>
- <execution>
- <id>generate-quote-sdo</id>
- <phase>generate-sources</phase>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/wsdl/Quote.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-avail-quote-sdo</id>
- <phase>generate-sources</phase>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/wsdl/AvailQuote.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-price-quote-sdo</id>
- <phase>generate-sources</phase>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/wsdl/PriceQuote.xsd</schemaFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.java
deleted file mode 100644
index 146939c190..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderImpl.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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.osoa.sca.annotations.Service;
-
-@Service(AvailQuoteProviderService.class)
-public class AvailQuoteProviderImpl implements AvailQuoteProviderService {
-
- public AvailQuote provideAvailQuote(String dummyString) {
- return TestHelper.buildAvailQuoteData();
- }
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.java
deleted file mode 100644
index ac55c02efa..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderNodeInfo.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 xquery.quote;
-
-import net.sf.saxon.om.NodeInfo;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-@Remotable
-@Service
-public interface AvailQuoteProviderNodeInfo {
- NodeInfo provideAvailQuote(String dummyString);
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.java
deleted file mode 100644
index 2715be19a9..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/AvailQuoteProviderService.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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-@Remotable
-@Service
-public interface AvailQuoteProviderService {
- AvailQuote provideAvailQuote(String dummyString);
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.java
deleted file mode 100644
index 84abb5c520..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/ExternalReferencesQuoteJoin.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 xquery.quote;
-
-import org.example.quote.Quote;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-@Remotable
-@Service
-public interface ExternalReferencesQuoteJoin {
- public Quote joinPriceAndAvailQuotes(float taxRate);
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.java
deleted file mode 100644
index a8bfc6ca1f..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProvider.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 xquery.quote;
-
-import org.example.price.PriceQuote;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-@Remotable
-@Service
-public interface PriceQuoteProvider {
-
- public PriceQuote providePriceQuote();
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.java
deleted file mode 100644
index cbd71f6279..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderImpl.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 xquery.quote;
-
-import org.example.price.PriceQuote;
-
-public class PriceQuoteProviderImpl implements PriceQuoteProvider {
- public PriceQuote providePriceQuote() {
- return TestHelper.buildPriceQuoteData();
- }
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.java
deleted file mode 100644
index c95c979c64..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PriceQuoteProviderNodeInfo.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 xquery.quote;
-
-import net.sf.saxon.om.NodeInfo;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-@Remotable
-@Service
-public interface PriceQuoteProviderNodeInfo {
- public NodeInfo providePriceQuote();
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.java
deleted file mode 100644
index 3a70f619a0..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/PropertiesQuoteJoin.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 xquery.quote;
-
-import org.example.quote.Quote;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-@Remotable
-@Service
-public interface PropertiesQuoteJoin {
- public Quote joinPriceAndAvailQuotes();
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.java
deleted file mode 100644
index 0b90c9fb0f..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculator.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 xquery.quote;
-
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-@Remotable
-@Service
-public interface QuoteCalculator {
- public float calculateTotalPrice(float taxRate, int quantity, float price, boolean fillOrder);
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
deleted file mode 100644
index 34fd24fbe5..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteCalculatorImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package xquery.quote;
-
-public class QuoteCalculatorImpl implements QuoteCalculator {
-
- public float calculateTotalPrice(float taxRate, int quantity, float price,
- boolean fillOrder) {
- float totalTax, costNoTax, totalCost;
- if (fillOrder)
- {
- // Calculate the total tax
- totalTax = taxRate * quantity * price;
- // Calculate the total cost without tax
- costNoTax = quantity * price;
- // Add the tax and the cost to get the total cost
- totalCost = totalTax + costNoTax;
- }
- else
- {
- totalCost = 0;
- }
- return totalCost;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.java
deleted file mode 100644
index fd16c4b4c5..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoin.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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.example.price.PriceQuote;
-import org.example.quote.Quote;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Service;
-
-@Remotable
-@Service
-public interface QuoteJoin {
- public Quote joinPriceAndAvailQuotes(PriceQuote priceQuote, AvailQuote availQuote, float taxRate);
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.java
deleted file mode 100644
index 5d1c7066fe..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocal.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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.example.price.PriceQuote;
-import org.example.quote.Quote;
-
-public interface QuoteJoinLocal {
- public Quote joinPriceAndAvailQuotes(PriceQuote priceQuote, AvailQuote availQuote, float taxRate);
- public Quote joinPriceAndAvailQuotesWs(PriceQuote priceQuote, AvailQuote availQuote, float taxRate);
- public Quote joinPriceAndAvailQuotes();
- public Quote joinPriceAndAvailQuotes(float taxRate);
-
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.java
deleted file mode 100644
index 2eff74fbc1..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/QuoteJoinLocalImpl.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 xquery.quote;
-
-import org.example.avail.AvailQuote;
-import org.example.price.PriceQuote;
-import org.example.quote.Quote;
-import org.osoa.sca.annotations.Reference;
-
-public class QuoteJoinLocalImpl implements QuoteJoinLocal {
- private QuoteJoin quoteJoin;
- private QuoteJoin quoteJoinWs;
- private PropertiesQuoteJoin propertiesQuoteJoin;
- private ExternalReferencesQuoteJoin externalServicesQuoteJoin;
-
- @Reference
- public void setQuoteJoin(QuoteJoin quoteJoin) {
- this.quoteJoin = quoteJoin;
- }
-
- @Reference
- public void setQuoteJoinWs(QuoteJoin quoteJoinWs) {
- this.quoteJoinWs = quoteJoinWs;
- }
-
- @Reference
- public void setPropertiesQuoteJoin(PropertiesQuoteJoin propertiesQuoteJoin) {
- this.propertiesQuoteJoin = propertiesQuoteJoin;
- }
-
- @Reference
- public void setExternalServicesQuoteJoin(ExternalReferencesQuoteJoin externalServicesQuoteJoin) {
- this.externalServicesQuoteJoin = externalServicesQuoteJoin;
- }
-
- public Quote joinPriceAndAvailQuotes(PriceQuote priceQuote, AvailQuote availQuote, float taxRate) {
- return quoteJoin.joinPriceAndAvailQuotes(priceQuote, availQuote, taxRate);
- }
-
- public Quote joinPriceAndAvailQuotesWs(PriceQuote priceQuote, AvailQuote availQuote, float taxRate) {
- return quoteJoinWs.joinPriceAndAvailQuotes(priceQuote, availQuote, taxRate);
- }
-
- public Quote joinPriceAndAvailQuotes(float taxRate) {
- return externalServicesQuoteJoin.joinPriceAndAvailQuotes(taxRate);
- }
-
- public Quote joinPriceAndAvailQuotes() {
- return propertiesQuoteJoin.joinPriceAndAvailQuotes();
- }
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/TestHelper.java b/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/TestHelper.java
deleted file mode 100644
index 65b4df0468..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/java/xquery/quote/TestHelper.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package xquery.quote;
-
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.example.avail.AvailFactory;
-import org.example.avail.AvailQuote;
-import org.example.avail.AvailRequest;
-import org.example.price.PriceFactory;
-import org.example.price.PriceQuote;
-import org.example.price.PriceRequest;
-import org.example.price.PriceRequests;
-import org.example.price.ShipAddress;
-import org.example.quote.Quote;
-import org.example.quote.QuoteResponse;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.impl.HelperProvider;
-
-public class TestHelper {
-
- public static AvailQuote buildAvailQuoteData() {
- AvailQuote availQuote = AvailFactory.INSTANCE.createAvailQuote();
- AvailRequest availRequest = AvailFactory.INSTANCE.createAvailRequest();
- availRequest.setWidgetId(BigInteger.valueOf(12));
- availRequest.setRequestedQuantity(10);
- availRequest.setQuantityAvail(true);
- availRequest.setShipDate("2003-03-22");
- availQuote.getAvailRequest().add(availRequest);
-
- availRequest = AvailFactory.INSTANCE.createAvailRequest();
- availRequest.setWidgetId(BigInteger.valueOf(134));
- availRequest.setRequestedQuantity(345);
- availRequest.setQuantityAvail(false);
- availRequest.setShipDate("BackOrder");
- availQuote.getAvailRequest().add(availRequest);
-
- availRequest = AvailFactory.INSTANCE.createAvailRequest();
- availRequest.setWidgetId(BigInteger.valueOf(211));
- availRequest.setRequestedQuantity(100);
- availRequest.setQuantityAvail(true);
- availRequest.setShipDate("2003-04-21");
- availQuote.getAvailRequest().add(availRequest);
-
- return availQuote;
- }
-
- public static PriceQuote buildPriceQuoteData() {
- PriceQuote priceQuote = PriceFactory.INSTANCE.createPriceQuote();
- priceQuote.setCustomerName("Acme Inc");
-
- ShipAddress shipAddress = PriceFactory.INSTANCE.createShipAddress();
- shipAddress.setStreet("12 Springs Rd");
- shipAddress.setCity("Morris Plains");
- shipAddress.setState("nj");
- shipAddress.setZip("07960");
- priceQuote.setShipAddress(shipAddress);
-
- PriceRequests priceRequests = PriceFactory.INSTANCE.createPriceRequests();
- PriceRequest priceRequest = PriceFactory.INSTANCE.createPriceRequest();
- priceRequest.setWidgetId(BigInteger.valueOf(12));
- priceRequest.setPrice(1.00f);
- priceRequests.getPriceRequest().add(priceRequest);
-
- priceRequest = PriceFactory.INSTANCE.createPriceRequest();
- priceRequest.setWidgetId(BigInteger.valueOf(134));
- priceRequest.setPrice(34.10f);
- priceRequests.getPriceRequest().add(priceRequest);
-
- priceRequest = PriceFactory.INSTANCE.createPriceRequest();
- priceRequest.setWidgetId(BigInteger.valueOf(211));
- priceRequest.setPrice(10.00f);
- priceRequests.getPriceRequest().add(priceRequest);
-
- priceQuote.setPriceRequests(priceRequests);
-
- return priceQuote;
- }
-
- public static void assertQuote(AvailQuote availQuote, PriceQuote priceQuote, Quote quote, float taxRate) {
- QuoteCalculatorImpl quoteCalculatorImpl = new QuoteCalculatorImpl();
-
- TestCase.assertEquals(priceQuote.getCustomerName(), quote.getName());
- ShipAddress shipAddress = priceQuote.getShipAddress();
- TestCase.assertEquals(shipAddress.getStreet()+","+shipAddress.getCity()+","+shipAddress.getState().toUpperCase()+","+shipAddress.getZip(), quote.getAddress());
- List availRequests = availQuote.getAvailRequest();
- List priceRequests = priceQuote.getPriceRequests().getPriceRequest();
- List quoteResponses = quote.getQuoteResponse();
- TestCase.assertEquals(availRequests.size(), priceRequests.size());
- TestCase.assertEquals(availRequests.size(), quoteResponses.size());
-
- for(int i=0; i<availRequests.size(); i++) {
- AvailRequest availRequest = (AvailRequest)availRequests.get(i);
- PriceRequest priceRequest = (PriceRequest)priceRequests.get(i);
- QuoteResponse quoteResponse = (QuoteResponse)quoteResponses.get(i);
- TestCase.assertEquals(availRequest.getWidgetId(), quoteResponse.getWidgetId());
- TestCase.assertEquals(priceRequest.getPrice(), quoteResponse.getUnitPrice());
- TestCase.assertEquals(availRequest.getRequestedQuantity(), quoteResponse.getRequestedQuantity());
- TestCase.assertEquals(availRequest.isQuantityAvail(), quoteResponse.isFillOrder());
- if(availRequest.getShipDate()==null) {
- TestCase.assertNull(quoteResponse.getShipDate());
- } else {
- TestCase.assertEquals(availRequest.getShipDate(), quoteResponse.getShipDate());
- }
- TestCase.assertEquals(taxRate, quoteResponse.getTaxRate());
- TestCase.assertEquals(quoteCalculatorImpl.calculateTotalPrice(taxRate, availRequest.getRequestedQuantity(), priceRequest.getPrice(), availRequest.isQuantityAvail()), quoteResponse.getTotalCost());
- }
- }
-
- public static void serializeToSystemOut(DataObject object, String name) {
- XMLHelper helper = HelperProvider.INSTANCE.xmlHelper();
-
- try {
- helper.save(object, null, name, System.out);
- System.out.println();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq b/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
deleted file mode 100644
index 9c521ae67b..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join.xq
+++ /dev/null
@@ -1,37 +0,0 @@
-declare namespace quoteJoin="scaservice:java/xquery.quote.QuoteJoin";
-
-declare namespace quoteCalculator="scareference:java/xquery.quote.QuoteCalculator";
-
-declare variable $quoteCalculator external;
-
-declare function quoteJoin:joinPriceAndAvailQuotes($priceQuoteDoc, $availQuoteDoc, $taxRate) {
-<quote>
- <name>{ data($priceQuoteDoc/priceQuote/customerName) }</name>
- <address>{ concat($priceQuoteDoc/priceQuote/shipAddress/@street , ",", $priceQuoteDoc/priceQuote/shipAddress/@city ,",", fn:upper-case($priceQuoteDoc/priceQuote/shipAddress/@state) , ",", $priceQuoteDoc/priceQuote/shipAddress/@zip) }</address>
- {
- for $priceRequest in $priceQuoteDoc/priceQuote/priceRequests/priceRequest,
- $availRequest in $availQuoteDoc/availQuote/availRequest
- where data($priceRequest/widgetId) = data($availRequest/widgetId)
- return
- <quoteResponse>
- <widgetId>{ data($priceRequest/widgetId) }</widgetId>
- <unitPrice>{ data($priceRequest/price) }</unitPrice>
- <requestedQuantity>{ data($availRequest/requestedQuantity) }</requestedQuantity>
- <fillOrder>{ data($availRequest/quantityAvail) }</fillOrder>
- {
- for $shipDate in $availRequest/shipDate
- return
- <shipDate>{ data($shipDate) }</shipDate>
- }
- <taxRate>{ $taxRate }</taxRate>
- <totalCost>{ quoteCalculator:calculateTotalPrice(
- $quoteCalculator,
-
- $taxRate,
- $availRequest/requestedQuantity,
- $priceRequest/price,
- $availRequest/quantityAvail) }</totalCost>
- </quoteResponse>
- }
- </quote>
-}; \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq b/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
deleted file mode 100644
index d6c6356080..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_external_references.xq
+++ /dev/null
@@ -1,49 +0,0 @@
-declare namespace quoteJoin="scaservice:java/xquery.quote.ExternalReferencesQuoteJoin";
-
-declare namespace quoteCalculator="scareference:java/xquery.quote.QuoteCalculator";
-
-declare namespace priceQuoteProvider="scareference:java/xquery.quote.PriceQuoteProviderNodeInfo";
-declare namespace availQuoteProvider="scareference:java/xquery.quote.AvailQuoteProviderNodeInfo";
-
-declare variable $quoteCalculator external;
-
-declare variable $priceQuoteProvider external;
-declare variable $availQuoteProvider external;
-
-declare function quoteJoin:joinPriceAndAvailQuotes($taxRate) {
-let $priceQuoteDoc := priceQuoteProvider:providePriceQuote($priceQuoteProvider)
-let $availQuoteDoc := availQuoteProvider:provideAvailQuote($availQuoteProvider, 'dummy')
-return
-<quote>
- <name>{ data($priceQuoteDoc/priceQuote/customerName) }</name>
- <address>{ concat($priceQuoteDoc/priceQuote/shipAddress/@street , ",", $priceQuoteDoc/priceQuote/shipAddress/@city ,",", fn:upper-case($priceQuoteDoc/priceQuote/shipAddress/@state) , ",", $priceQuoteDoc/priceQuote/shipAddress/@zip) }</address>
- {
- for $priceRequest in $priceQuoteDoc/priceQuote/priceRequests/priceRequest,
- $availRequest in $availQuoteDoc/availQuote/availRequest
- where data($priceRequest/widgetId) = data($availRequest/widgetId)
- return
- <quoteResponse>
- <widgetId>{ data($priceRequest/widgetId) }</widgetId>
- <unitPrice>{ data($priceRequest/price) }</unitPrice>
- <requestedQuantity>{ data($availRequest/requestedQuantity) }</requestedQuantity>
- <fillOrder>{ data($availRequest/quantityAvail) }</fillOrder>
- {
- for $shipDate in $availRequest/shipDate
- return
- <shipDate>{ data($shipDate) }</shipDate>
- }
- <taxRate>{ $taxRate }</taxRate>
- <totalCost>{ quoteCalculator:calculateTotalPrice(
- $quoteCalculator,
-
- $taxRate,
-
- $availRequest/requestedQuantity,
-
- $priceRequest/price,
-
- $availRequest/quantityAvail) }</totalCost>
- </quoteResponse>
- }
- </quote>
-}; \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq b/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
deleted file mode 100644
index 62275b41f8..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/META-INF/sca/quote_join_properties.xq
+++ /dev/null
@@ -1,48 +0,0 @@
-declare namespace quoteJoin="scaservice:java/xquery.quote.PropertiesQuoteJoin";
-
-declare namespace quoteCalculator="scareference:java/xquery.quote.QuoteCalculator";
-
-declare namespace priceQuoteDoc="scaproperty:xml/http://www.example.org/price:priceQuote";
-declare namespace availQuoteDoc="scaproperty:xml/http://www.example.org/avail:availQuote";
-declare namespace taxRate="scaproperty:java/java.lang.Float";
-
-declare variable $quoteCalculator external;
-
-declare variable $priceQuoteDoc external;
-declare variable $availQuoteDoc external;
-declare variable $taxRate external;
-
-declare function quoteJoin:joinPriceAndAvailQuotes() {
-<quote>
- <name>{ data($priceQuoteDoc/priceQuote/customerName) }</name>
- <address>{ concat($priceQuoteDoc/priceQuote/shipAddress/@street , ",", $priceQuoteDoc/priceQuote/shipAddress/@city ,",", fn:upper-case($priceQuoteDoc/priceQuote/shipAddress/@state) , ",", $priceQuoteDoc/priceQuote/shipAddress/@zip) }</address>
- {
- for $priceRequest in $priceQuoteDoc/priceQuote/priceRequests/priceRequest,
- $availRequest in $availQuoteDoc/availQuote/availRequest
- where data($priceRequest/widgetId) = data($availRequest/widgetId)
- return
- <quoteResponse>
- <widgetId>{ data($priceRequest/widgetId) }</widgetId>
- <unitPrice>{ data($priceRequest/price) }</unitPrice>
- <requestedQuantity>{ data($availRequest/requestedQuantity) }</requestedQuantity>
- <fillOrder>{ data($availRequest/quantityAvail) }</fillOrder>
- {
- for $shipDate in $availRequest/shipDate
- return
- <shipDate>{ data($shipDate) }</shipDate>
- }
- <taxRate>{ $taxRate }</taxRate>
- <totalCost>{ quoteCalculator:calculateTotalPrice(
- $quoteCalculator,
-
- $taxRate,
-
- $availRequest/requestedQuantity,
-
- $priceRequest/price,
-
- $availRequest/quantityAvail) }</totalCost>
- </quoteResponse>
- }
- </quote>
-}; \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd b/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
deleted file mode 100644
index e7f3e67068..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/AvailQuote.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<xsd:schema targetNamespace="http://www.example.org/avail" xmlns:ava="http://www.example.org/avail" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
- <xsd:element name="availQuote" type="ava:AvailQuote"/>
- <xsd:complexType name="AvailRequest">
- <xsd:sequence>
- <xsd:element name="widgetId" type="xsd:integer"/>
- <xsd:element name="requestedQuantity" type="xsd:int"/>
- <xsd:element name="quantityAvail" type="xsd:boolean"/>
- <xsd:element name="shipDate" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="AvailQuote">
- <xsd:sequence>
- <xsd:element name="availRequest" type="ava:AvailRequest" minOccurs="1" maxOccurs="10">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
-
-
-
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd b/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
deleted file mode 100644
index 4c437586ef..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/PriceQuote.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<xsd:schema targetNamespace="http://www.example.org/price" xmlns:pri="http://www.example.org/price" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
- <xsd:element name="priceQuote" type="pri:PriceQuote"/>
- <xsd:complexType name="PriceRequest">
- <xsd:sequence>
- <xsd:element name="widgetId" type="xsd:integer"/>
- <xsd:element name="price" type="xsd:float"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="PriceRequests">
- <xsd:sequence>
- <xsd:element name="priceRequest" type="pri:PriceRequest" minOccurs="1" maxOccurs="10"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="ShipAddress">
- <xsd:attribute name="street" type="xsd:string"/>
- <xsd:attribute name="city" type="xsd:string"/>
- <xsd:attribute name="state" type="xsd:string"/>
- <xsd:attribute name="zip" type="xsd:string"/>
- </xsd:complexType>
- <xsd:complexType name="PriceQuote">
- <xsd:sequence>
- <xsd:element name="customerName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="shipAddress" type="pri:ShipAddress" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="priceRequests" type="pri:PriceRequests"/>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
-
-
-
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd b/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
deleted file mode 100644
index 4f64850056..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/Quote.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<xsd:schema targetNamespace="http://www.example.org/quote" xmlns:quo="http://www.example.org/quote" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified">
- <xsd:element name="quote" type="quo:Quote"/>
- <xsd:complexType name="Quote">
- <xsd:sequence>
- <xsd:element name="name" type="xsd:string"/>
- <xsd:element name="address" type="xsd:string"/>
- <xsd:element name="quoteResponse" type="quo:QuoteResponse" minOccurs="1" maxOccurs="10"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="QuoteResponse">
- <xsd:sequence>
- <xsd:element name="widgetId" type="xsd:integer"/>
- <xsd:element name="unitPrice" type="xsd:float" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="requestedQuantity" type="xsd:int"/>
- <xsd:element name="fillOrder" type="xsd:boolean"/>
- <xsd:element name="shipDate" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="taxRate" type="xsd:float" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="totalCost" type="xsd:float" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/availquoteprovider.wsdl b/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/availquoteprovider.wsdl
deleted file mode 100644
index f4744c8a14..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/availquoteprovider.wsdl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<wsdl:definitions targetNamespace="http://quote.xquery" xmlns:tns="http://quote.xquery"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:ava="http://www.example.org/avail" name="quotejoin">
-
- <wsdl:import namespace="http://www.example.org/avail" location="AvailQuote.xsd"/>
- <wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://quote.xquery"
- xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ava="http://www.example.org/avail">
-
- <element name="provideAvailQuote">
- <complexType>
- <sequence>
- <element name="provideAvailQuote" type="xsd:String" />
- </sequence>
- </complexType>
- </element>
- <element name="provideAvailQuoteResponse">
- <complexType>
- <sequence>
- <element name="provideAvailQuoteReturn" type="ava:AvailQuote" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </wsdl:types>
-
- <wsdl:message name="provideAvailQuoteRequest">
- <wsdl:part element="tns:provideAvailQuote" name="parameters" />
- </wsdl:message>
- <wsdl:message name="provideAvailQuoteResponse">
- <wsdl:part element="tns:provideAvailQuoteResponse" name="parameters" />
- </wsdl:message>
-
- <wsdl:portType name="AvailQuoteProvider">
- <wsdl:operation name="provideAvailQuote">
- <wsdl:input message="tns:provideAvailQuoteRequest" name="provideAvailQuoteRequest" />
- <wsdl:output message="tns:provideAvailQuoteResponse" name="provideAvailQuoteResponse" />
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="AvailQuoteProviderSoapBinding" type="tns:AvailQuoteProvider">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="provideAvailQuote">
- <wsdlsoap:operation soapAction="" />
- <wsdl:input name="provideAvailQuoteRequest">
- <wsdlsoap:body use="literal" />
- </wsdl:input>
- <wsdl:output name="provideAvailQuoteResponse">
- <wsdlsoap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="AvailQuoteProviderService">
- <wsdl:port binding="tns:AvailQuoteProviderSoapBinding" name="AvailQuoteProviderSoapPort">
- <wsdlsoap:address location="http://localhost:8085/AvailQuoteProviderService" />
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl b/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
deleted file mode 100644
index b48dc2117b..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/wsdl/quotejoin.wsdl
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<wsdl:definitions targetNamespace="http://quote.xquery" xmlns:tns="http://quote.xquery"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:ava="http://www.example.org/avail"
- xmlns:pri="http://www.example.org/price"
- xmlns:quo="http://www.example.org/quote" name="quotejoin">
-
- <wsdl:import namespace="http://www.example.org/avail" location="AvailQuote.xsd"/>
- <wsdl:import namespace="http://www.example.org/price" location="PriceQuote.xsd"/>
- <wsdl:import namespace="http://www.example.org/quote" location="Quote.xsd"/>
- <wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://quote.xquery"
- xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ava="http://www.example.org/avail"
- xmlns:pri="http://www.example.org/price" xmlns:quo="http://www.example.org/quote">
-
- <element name="joinPriceAndAvailQuotes">
- <complexType>
- <sequence>
- <element name="priceQuote" type="pri:PriceQuote" />
- <element name="availQuote" type="ava:AvailQuote" />
- <element name="taxRate" type="xsd:float" />
- </sequence>
- </complexType>
- </element>
-
- <element name="joinPriceAndAvailQuotesResponse">
- <complexType>
- <sequence>
- <element name="joinPriceAndAvailQuotesReturn" type="quo:Quote" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </wsdl:types>
-
- <wsdl:message name="joinPriceAndAvailQuotesRequest">
- <wsdl:part element="tns:joinPriceAndAvailQuotes" name="parameters" />
- </wsdl:message>
-
- <wsdl:message name="joinPriceAndAvailQuotesResponse">
- <wsdl:part element="tns:joinPriceAndAvailQuotesResponse" name="parameters" />
- </wsdl:message>
-
- <wsdl:portType name="QuoteJoin">
- <wsdl:operation name="joinPriceAndAvailQuotes">
- <wsdl:input message="tns:joinPriceAndAvailQuotesRequest" name="joinPriceAndAvailQuotesRequest" />
- <wsdl:output message="tns:joinPriceAndAvailQuotesResponse" name="joinPriceAndAvailQuotesResponse" />
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="QuoteJoinSoapBinding" type="tns:QuoteJoin">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="joinPriceAndAvailQuotes">
- <wsdlsoap:operation soapAction="" />
- <wsdl:input name="joinPriceAndAvailQuotesRequest">
- <wsdlsoap:body use="literal" />
- </wsdl:input>
- <wsdl:output name="joinPriceAndAvailQuotesResponse">
- <wsdlsoap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="QuoteJoinService">
- <wsdl:port binding="tns:QuoteJoinSoapBinding" name="QuoteJoinSoapPort">
- <wsdlsoap:address location="http://localhost:8085/QuoteJoinService" />
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotews.composite b/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotews.composite
deleted file mode 100644
index fc360d7d6f..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotews.composite
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://quote.xquery"
- xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:xq="http://quote.xquery"
- name="xqueryquotews">
-
- <dbsdo:import.sdo factory="org.example.avail.AvailFactory"/>
- <dbsdo:import.sdo factory="org.example.price.PriceFactory"/>
- <dbsdo:import.sdo factory="org.example.quote.QuoteFactory"/>
-
- <component name="QuoteJoinServerComponent">
- <service name="QuoteJoin">
- <interface.java interface="xquery.quote.QuoteJoin" />
- <binding.ws wsdlElement="http://quote.xquery#wsdl.port(QuoteJoinService/QuoteJoinSoapPort)"/>
- </service>
- <implementation.xquery location="META-INF/sca/quote_join.xq"/>
- <reference name="quoteCalculator" target="QuoteCalculatorServerComponent" />
- </component>
-
- <component name="QuoteCalculatorServerComponent">
- <implementation.java class="xquery.quote.QuoteCalculatorImpl"/>
- </component>
-
- <component name="AvailQuoteProviderComponent">
- <service name="AvailQuoteProvider">
- <interface.java interface="xquery.quote.AvailQuoteProviderService" />
- <binding.ws wsdlElement="http://quote.xquery#wsdl.port(AvailQuoteProviderService/AvailQuoteProviderSoapPort)"/>
- </service>
- <implementation.java class="xquery.quote.AvailQuoteProviderImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite b/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
deleted file mode 100644
index dbdf2b677c..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://quote.xquery/client"
- xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
- xmlns:xq="http://quote.xquery/client" name="xqueryquotewsclient">
-
- <dbsdo:import.sdo factory="org.example.avail.AvailFactory"/>
- <dbsdo:import.sdo factory="org.example.price.PriceFactory"/>
- <dbsdo:import.sdo factory="org.example.quote.QuoteFactory"/>
-
- <component name="QuoteJoinLocalComponent">
- <implementation.java class="xquery.quote.QuoteJoinLocalImpl"/>
- <reference name="quoteJoin" target="QuoteJoinComponent"/>
- <reference name="propertiesQuoteJoin" target="QuoteJoinPropertiesComponent"/>
- <reference name="externalServicesQuoteJoin" target="QuoteJoinExternalReferencesComponent"/>
- </component>
-
- <component name="QuoteJoinComponent">
- <implementation.xquery location="META-INF/sca/quote_join.xq"/>
- <reference name="quoteCalculator" target="QuoteCalculatorComponent" />
- </component>
- <component name="QuoteJoinPropertiesComponent">
- <implementation.xquery location="META-INF/sca/quote_join_properties.xq"/>
- <property name="priceQuoteDoc">
- <pri:priceQuote xmlns:pri="http://www.example.org/price">
- <pri:customerName>Acme Inc</pri:customerName>
- <pri:shipAddress pri:street="12 Springs Rd" pri:city="Morris Plains" pri:state="nj" pri:zip="07960"/>
- <pri:priceRequests>
- <pri:priceRequest>
- <pri:widgetId>12</pri:widgetId>
- <pri:price>1.0</pri:price>
- </pri:priceRequest>
- <pri:priceRequest>
- <pri:widgetId>134</pri:widgetId>
- <pri:price>34.1</pri:price>
- </pri:priceRequest>
- <pri:priceRequest>
- <pri:widgetId>211</pri:widgetId>
- <pri:price>10.0</pri:price>
- </pri:priceRequest>
- </pri:priceRequests>
- </pri:priceQuote>
- </property>
- <property name="availQuoteDoc">
- <ava:availQuote xmlns:ava="http://www.example.org/avail">
- <ava:availRequest>
- <ava:widgetId>12</ava:widgetId>
- <ava:requestedQuantity>10</ava:requestedQuantity>
- <ava:quantityAvail>true</ava:quantityAvail>
- <ava:shipDate>2003-03-22</ava:shipDate>
- </ava:availRequest>
- <ava:availRequest>
- <ava:widgetId>134</ava:widgetId>
- <ava:requestedQuantity>345</ava:requestedQuantity>
- <ava:quantityAvail>false</ava:quantityAvail>
- <ava:shipDate>BackOrder</ava:shipDate>
- </ava:availRequest>
- <ava:availRequest>
- <ava:widgetId>211</ava:widgetId>
- <ava:requestedQuantity>100</ava:requestedQuantity>
- <ava:quantityAvail>true</ava:quantityAvail>
- <ava:shipDate>2003-04-21</ava:shipDate>
- </ava:availRequest>
- </ava:availQuote>
- </property>
- <property name="taxRate">0.1</property>
- <reference name="quoteCalculator" target="QuoteCalculatorComponent" />
- </component>
- <component name="QuoteJoinExternalReferencesComponent">
- <implementation.xquery location="META-INF/sca/quote_join_external_references.xq"/>
- <reference name="quoteCalculator" target="QuoteCalculatorComponent" />
- <reference name="priceQuoteProvider" target="PriceQuoteProviderComponent" />
- </component>
-
- <component name="QuoteCalculatorComponent">
- <implementation.java class="xquery.quote.QuoteCalculatorImpl"/>
- </component>
-
- <component name="PriceQuoteProviderComponent">
- <implementation.java class="xquery.quote.PriceQuoteProviderImpl"/>
- </component>
-
- <reference name="availQuoteProvider" promote="QuoteJoinExternalReferencesComponent/availQuoteProvider">
- <interface.java interface="xquery.quote.AvailQuoteProviderService" />
- <binding.ws wsdlElement="http://quote.xquery#wsdl.port(AvailQuoteProviderService/AvailQuoteProviderSoapPort)" />
- </reference>
- <reference name="quoteJoinWs" promote="QuoteJoinLocalComponent/quoteJoinWs">
- <interface.java interface="xquery.quote.QuoteJoin" />
- <binding.ws wsdlElement="http://quote.xquery#wsdl.port(QuoteJoinService/QuoteJoinSoapPort)" />
- </reference>
-</composite>
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java b/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
deleted file mode 100644
index 97febf65e9..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package xquery.quote;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.example.avail.AvailQuote;
-import org.example.price.PriceQuote;
-import org.example.quote.Quote;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import commonj.sdo.DataObject;
-
-/**
- * Integration test for the XQuery implementation type
- * @version $Rev$ $Date$
- * This test covers the most important integration scenarios for the xquery
- * implementation type and its corresponding saxon data bindings:
- *
- * 1. There is a central component for invoking the different
- * scenarios: QuoteJoinLocalComponent
- * 2. It provides the following tests:
- * - invoke XQuery component in the current assembly, by providing all needed
- * information as input parameters
- * - invoke XQuery component in external assembly, which is exposed as a web
- * service
- * - invoke XQuery component in the current assembly, which retrieves the needed
- * information from the component properties
- * - invoke XQuery component in the current assembly, which retrieves the needed
- * information from its references to other components:
- * - one of the components is in the current assembly
- * - the other component is in anther assembly and it is exposed (and accessed)
- * as web service
- *
- * 3. All of the XQuery components have reference to a component for calculation of the
- * total price
- * 4. SDO is used for data interchange
- */
-public class XQueryQuoteClientTestCase {
-
- public static boolean SHOW_DEBUG_MSG = false;
-
- private SCADomain scaDomain;
- private SCATestCaseRunner server;
-
- private QuoteJoinLocal quoteJoinLocal;
-
- @Before
- public void startClient() throws Exception {
- try {
- scaDomain = SCADomain.newInstance("xqueryquotewsclient.composite");
-
- quoteJoinLocal = scaDomain.getService(QuoteJoinLocal.class, "QuoteJoinLocalComponent");
-
- server = new SCATestCaseRunner(XQueryQuoteTestServer.class);
- server.before();
- } catch(Throwable t) {
- t.printStackTrace();
- }
- }
-
- @Test
- public void testQuoteJoin() {
- AvailQuote availQuote = TestHelper.buildAvailQuoteData();
- PriceQuote priceQuote = TestHelper.buildPriceQuoteData();
-
- if(SHOW_DEBUG_MSG) {
- System.out.println("Input quote for the price list:");
- TestHelper.serializeToSystemOut((DataObject)priceQuote, "priceQuote");
- System.out.println();
- System.out.println("Input quote for the availability:");
- TestHelper.serializeToSystemOut((DataObject)availQuote, "availQuote");
- System.out.println();
- }
-
- Quote quote = quoteJoinLocal.joinPriceAndAvailQuotes(priceQuote, availQuote, 0.1f);
- TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);
- if(SHOW_DEBUG_MSG) {
- System.out.println();
- System.out.println("Output quote from local join:");
- TestHelper.serializeToSystemOut((DataObject)quote, "quote");
- System.out.println();
- }
-
- quote = quoteJoinLocal.joinPriceAndAvailQuotes(priceQuote, availQuote, 0.2f);
- TestHelper.assertQuote(availQuote, priceQuote, quote, 0.2f);
- if(SHOW_DEBUG_MSG) {
- System.out.println();
- System.out.println("Output quote from local join (second invokation):");
- TestHelper.serializeToSystemOut((DataObject)quote, "quote");
- System.out.println();
- }
-
- quote = quoteJoinLocal.joinPriceAndAvailQuotesWs(priceQuote, availQuote, 0.1f);
- TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);
- if(SHOW_DEBUG_MSG) {
- System.out.println();
- System.out.println("Output quote from web service join:");
- TestHelper.serializeToSystemOut((DataObject)quote, "quote");
- System.out.println();
- }
-
- quote = quoteJoinLocal.joinPriceAndAvailQuotes();
- TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);
- if(SHOW_DEBUG_MSG) {
- System.out.println();
- System.out.println("Output quote from properties join:");
- TestHelper.serializeToSystemOut((DataObject)quote, "quote");
- System.out.println();
- }
-
- quote = quoteJoinLocal.joinPriceAndAvailQuotes(0.1f);
- TestHelper.assertQuote(availQuote, priceQuote, quote, 0.1f);
- if(SHOW_DEBUG_MSG) {
- System.out.println();
- System.out.println("Output quote from external references join:");
- TestHelper.serializeToSystemOut((DataObject)quote, "quote");
- System.out.println();
- }
- }
-
- @After
- public void stopClient() throws Exception {
- server.after();
- scaDomain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java b/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.java
deleted file mode 100644
index cc78f4103b..0000000000
--- a/branches/sca-java-0.99/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteTestServer.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 xquery.quote;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class XQueryQuoteTestServer {
- private SCADomain scaDomain;
-
- @Before
- public void startServer() throws Exception {
- try {
- scaDomain = SCADomain.newInstance("xqueryquotews.composite");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
- @After
- public void stopServer() throws Exception {
- scaDomain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/README b/branches/sca-java-0.99/samples/simple-bigbank-spring/README
deleted file mode 100644
index 8a8d616857..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/README
+++ /dev/null
@@ -1,91 +0,0 @@
-Spring Bigbank Sample
-=================
-This sample implements a simple a version of the BigBank scenrio used in
-various places in the SCA specification documents.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-simple-bigbank-spring.jar bigbank.client.BigBankClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-simple-bigbank-spring.jar bigbank.client.BigBankClient
-
-
-Sample Overview
----------------
-The sample provides a composite with two java components wired together
-with a default binding. A request to the AccountComponent results in a
-request to the AccountDataComponent to get account data. The data returns
-back via the AccountComponent to the client.
-
-simple-bigbank-spring/
- src/
- main/
- java/
- bigbank/
- account/ - AccountComponent implementation
- accountdata/ - AccountDataComponent implementation
- client/ - starts the SCA Runtime and
- deploys the BigBank.composite.
- It then calls the deployed AccountService
- resources/
- Account.composite - SCA assembly for this sample
- BigBank.composite - SCA assembly for this sample
- StockQuote.composite - SCA assembly for this sample
- test/
- java/
- bigbank/
- BigBankTestCase.java - JUnit test case
- simple-bigbank-spring.png - a pictorial representation of the sample
- .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd simple-bigbank-spring
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Account summary: currency: USD, [ID:Foo_CHA12345, balance:1500.0, ID
-:Foo_SAA12345, balance:1500.0, ID:Foo_STA12345, symbol:IBM, quantity:100]
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd simple-bigbank-spring
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running bigbank.BigBankTestCase
-Account summary: currency: USD, [ID:Foo_CHA12345, balance:1500.0, ID:Foo_SAA1234
-5, balance:1500.0, ID:Foo_STA12345, symbol:IBM, quantity:100, balance:10432.0]]
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.592 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/build.xml b/branches/sca-java-0.99/samples/simple-bigbank-spring/build.xml
deleted file mode 100644
index ecc2596d71..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="spring-bigbank" default="compile">
- <property name="test.class" value="bigbank.client.BigBankClient" />
- <property name="test.jar" value="sample-simple-bigbank-spring.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/pom.xml b/branches/sca-java-0.99/samples/simple-bigbank-spring/pom.xml
deleted file mode 100644
index fd8a0a2546..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-simple-bigbank-spring</artifactId>
- <name>Apache Tuscany Simplified Spring-Based BigBank Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-spring</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.png b/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.png
deleted file mode 100644
index 593c047f6a..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.svg
deleted file mode 100644
index c64f6de6b9..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/simple-bigbank-spring.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-bigbank"
- sodipodi:docname="simple-bigbank.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-bigbank\simple-bigbank.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="468.4064"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="120"
- inkscape:window-y="172" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997">
- <rect
- rx="15.307091"
- ry="12.692303"
- y="192.00233"
- x="258.31146"
- height="299.99988"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">BigBank</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="339.91632"
- y="310.73904"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(84.32554,112.8005)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Account</flowPara><flowPara
- id="flowPara1883">Service</flowPara><flowPara
- id="flowPara1885">Component</flowPara></flowRoot> <rect
- style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:0.99999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3006"
- width="43.861084"
- height="29.993773"
- x="376.59262"
- y="285.79593"
- rx="21.930542"
- ry="0" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 436.01825,340.74775 L 469.35329,340.74775 L 475.4142,353.87973 L 468.34314,366.00157 L 436.01825,366.00157 L 443.5944,353.87973 L 436.01825,340.74775 z "
- id="path3019" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 226.73063,330.75341 L 280.61512,330.75341 L 290.41229,356.14253 L 278.98226,379.57867 L 226.73063,379.57867 L 238.97711,356.14253 L 226.73063,330.75341 z "
- id="path1887" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1889"
- width="115.66247"
- height="85.862968"
- x="557.25488"
- y="308.38455"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1891"
- transform="translate(301.6641,110.446)"><flowRegion
- id="flowRegion1893"><rect
- id="rect1895"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1897">Account</flowPara><flowPara
- id="flowPara1909">Data</flowPara><flowPara
- id="flowPara1899">Service</flowPara><flowPara
- id="flowPara1901">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 540.10438,340.23154 L 573.43942,340.23154 L 579.50033,353.36352 L 572.42927,365.48536 L 540.10438,365.48536 L 547.68053,353.36352 L 540.10438,340.23154 z "
- id="path1905" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 290,355.52305 C 329.28571,355.52305 329.28571,355.52305 329.28571,355.52305"
- id="path1913" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 475,353.3802 C 547.14286,352.66591 547.14286,352.66591 547.14286,352.66591"
- id="path1919" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1921"
- transform="translate(95.23912,80.79069)"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1923"><rect
- id="rect1925"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1931">currency</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot1933"
- transform="translate(-42.61803,130.0764)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1935"><rect
- id="rect1937"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1939">Account</flowPara><flowPara
- id="flowPara1941">Service</flowPara><flowPara
- id="flowPara1943" /></flowRoot> </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
deleted file mode 100644
index 1625ff5b65..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.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 bigbank.account;
-
-import java.util.List;
-
-/**
- */
-public class AccountReport {
- private List<String> summaries;
- private String currency;
-
- public AccountReport(String currency, List<String> summaries) {
- this.currency = currency;
- this.summaries = summaries;
- }
-
- public List getAccountSummaries() { return summaries; }
-
- public String getCurrency() { return currency; }
-
- @Override
- public String toString() {
- return "currency: "+ currency + ", " + summaries;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
deleted file mode 100644
index 7c9082b944..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account;
-
-/**
- * Interface for a account service
- */
-public interface AccountService {
- public AccountReport getAccountReport(String customerID);
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
deleted file mode 100644
index ae9071445d..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import bigbank.accountdata.AccountDataService;
-import bigbank.accountdata.CheckingAccount;
-import bigbank.accountdata.SavingsAccount;
-import bigbank.accountdata.StockAccount;
-import bigbank.stockquote.StockQuoteService;
-
-/**
- * Account service implementation
- */
-public class AccountServiceImpl implements AccountService {
-
- private AccountDataService accountDataService;
-
- private StockQuoteService stockQuoteService;
-
- private String currency;
-
- public AccountReport getAccountReport(String s) {
- List<String> summaries = new ArrayList<String>();
-
- CheckingAccount ca = accountDataService.getCheckingAccount(s);
- summaries.add(ca.getSummary());
-
- SavingsAccount sa = accountDataService.getSavingsAccount(s);
- summaries.add(sa.getSummary());
-
- StockAccount sk = accountDataService.getStockAccount(s);
-
- double price = stockQuoteService.getQuote(sk.getSymbol());
- sk.setBalance(sk.getQuantity() * price);
-
- summaries.add(sk.getSummary());
-
- AccountReport report = new AccountReport(currency, summaries);
-
- return report;
- }
-
- public AccountDataService getAccountDataService() {
- return accountDataService;
- }
-
- public void setAccountDataService(AccountDataService accountDataService) {
- this.accountDataService = accountDataService;
- }
-
- public String getCurrency() {
- return currency;
- }
-
- public void setCurrency(String currency) {
- this.currency = currency;
- }
-
- public StockQuoteService getStockQuoteService() {
- return stockQuoteService;
- }
-
- public void setStockQuoteService(StockQuoteService stockQuoteService) {
- this.stockQuoteService = stockQuoteService;
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
deleted file mode 100644
index a5ae7b3955..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/Account.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.accountdata;
-
-/**
- * Interface for a account service
- */
-public interface Account {
- String getSummary();
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.java
deleted file mode 100644
index c354de387b..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataService.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 bigbank.accountdata;
-
-/**
- * Interface for a account data service
- */
-public interface AccountDataService {
- public CheckingAccount getCheckingAccount(String customerID);
- public SavingsAccount getSavingsAccount(String customerID);
- public StockAccount getStockAccount(String customerID);
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index 000acb935c..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/AccountDataServiceImpl.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 bigbank.accountdata;
-
-
-/**
- * Account data service implementation
- */
-public class AccountDataServiceImpl implements AccountDataService {
-
- public CheckingAccount getCheckingAccount(String customerID) {
-
- CheckingAccount checkingAccount = new CheckingAccount();
- checkingAccount.setAccountNumber(customerID+"_"+"CHA12345");
- checkingAccount.setBalance(1500.0f);
-
- return checkingAccount;
- }
-
- public SavingsAccount getSavingsAccount(String customerID) {
-
- SavingsAccount savingsAccount = new SavingsAccount();
- savingsAccount.setAccountNumber(customerID+"_"+"SAA12345");
- savingsAccount.setBalance(1500.0f);
-
- return savingsAccount;
- }
-
- public StockAccount getStockAccount(String customerID) {
-
- StockAccount stockAccount = new StockAccount();
- stockAccount.setAccountNumber(customerID+"_"+"STA12345");
- stockAccount.setSymbol("IBM");
- stockAccount.setQuantity(100);
-
- return stockAccount;
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.java
deleted file mode 100644
index 11bdff757e..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/CheckingAccount.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 bigbank.accountdata;
-
-/**
- * An account service implementation for a checking account
- */
-public class CheckingAccount implements Account {
- private String accountNumber;
- private double balance;
-
- public String getAccountNumber() { return accountNumber; }
- public void setAccountNumber(String n) { this.accountNumber = n; }
-
- public double getBalance() { return balance; }
- public void setBalance(double b) { this.balance = b; }
-
- public String getSummary() { return "ID:" + accountNumber + ", balance:" + balance; }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.java
deleted file mode 100644
index b791024076..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/SavingsAccount.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 bigbank.accountdata;
-
-/**
- * An account service implementation for a savings account
- */
-public class SavingsAccount implements Account {
- private String accountNumber;
- private double balance;
-
- public String getAccountNumber() { return accountNumber; }
- public void setAccountNumber(String n) { this.accountNumber = n; }
-
- public double getBalance() { return balance; }
- public void setBalance(double b) { this.balance = b; }
-
- public String getSummary() { return "ID:" + accountNumber + ", balance:" + balance; }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.java
deleted file mode 100644
index 86246a3f84..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/accountdata/StockAccount.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 bigbank.accountdata;
-
-/**
- * An account service implementation for a stock account
- */
-public class StockAccount implements Account {
- private String accountNumber;
- private String symbol;
- private int quantity;
- private double balance;
-
- public String getAccountNumber() { return accountNumber; }
- public void setAccountNumber(String n) { this.accountNumber = n; }
-
- public double getQuantity() { return quantity; }
- public void setQuantity(int a) { this.quantity = a; }
-
- public String getSymbol() { return symbol; }
- public void setSymbol(String s) { this.symbol = s; }
-
- public double getBalance() { return balance; }
- public void setBalance(double balance) { this.balance = balance; }
-
- public String getSummary() { return "ID:" + accountNumber + ", symbol:" + symbol + ", quantity:" + quantity + ", balance:" + balance; }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
deleted file mode 100644
index edbf910d37..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.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 bigbank.client;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import bigbank.account.AccountService;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class BigBankClient {
- public static void main(String[] args) throws Exception {
-
- SCADomain scaDomain = SCADomain.newInstance("BigBank.composite");
-
- AccountService accountService = scaDomain.getService(AccountService.class,
- "AccountServiceComponent");
-
- System.out.println("Account summary: " + accountService.getAccountReport("Foo") );
-
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
deleted file mode 100644
index 0512d40b0b..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.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 bigbank.stockquote;
-
-
-/**
- * This class implements the StockQuote service.
- */
-public class StockQuoteImpl implements StockQuoteService {
-
- public double getQuote(String symbol) {
- double price = 104.0 + Math.random();
- price = ((int)(price * 100)) / 100.0;
-
- System.out.println("Getting stock quote for: " + symbol + ", value: "+ price);
-
- return price;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
deleted file mode 100644
index 2d97b57066..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.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 bigbank.stockquote;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-public interface StockQuoteService {
-
- public double getQuote(String symbol);
-}
-
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
deleted file mode 100644
index 2d882472fb..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/Account-spring-context.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sca="http://www.springframework.org/schema/sca"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/sca http://www.springframework.org/schema/sca/spring-sca.xsd">
-
- <sca:service name="AccountService"
- type="bigbank.account.AccountService" target="AccountServiceBean"/>
-
- <bean id="AccountServiceBean" class="bigbank.account.AccountServiceImpl">
- <property name="accountDataService" ref="AccountDataServiceBean"/>
- <property name="stockQuoteService" ref="stockQuoteService"/>
- <property name="currency" value="USD"/>
- </bean>
-
- <bean id="AccountDataServiceBean" class="bigbank.accountdata.AccountDataServiceImpl">
- </bean>
-
- <sca:reference name="stockQuoteService"
- type="bigbank.stockquote.StockQuoteService"/>
-
-</beans>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
deleted file mode 100644
index 727327ef30..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://bigbank"
- xmlns:s="http://stockquote"
- name="BigBank">
-
- <component name="AccountServiceComponent">
- <tuscany:implementation.spring location="Account-spring-context.xml"/>
- <reference name="stockQuoteService" target="StockQuoteServiceComponent"/>
- </component>
-
- <component name="StockQuoteServiceComponent">
- <implementation.composite name="s:StockQuote"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
deleted file mode 100644
index 26bdc59075..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/main/resources/StockQuote.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://stockquote"
- name="StockQuote">
-
- <service name="StockQuoteService" promote="StockQuoteServiceComponent"/>
-
- <component name="StockQuoteServiceComponent">
- <implementation.java class="bigbank.stockquote.StockQuoteImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/branches/sca-java-0.99/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
deleted file mode 100644
index ba6c1dd797..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.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 bigbank;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import bigbank.account.AccountService;
-
-/**
- * Tests out the big bank service
- *
- */
-public class BigBankTestCase extends TestCase {
-
- private SCADomain scaDomain;
- AccountService accountService;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("BigBank.composite");
- accountService = scaDomain.getService(AccountService.class, "AccountServiceComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void test() throws Exception {
- System.out.println("Account summary: " + accountService.getAccountReport("Foo") );
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/README b/branches/sca-java-0.99/samples/simple-bigbank/README
deleted file mode 100644
index 55170005d3..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/README
+++ /dev/null
@@ -1,91 +0,0 @@
-Calculator Sample
-=================
-This sample implements a simple a version of the BigBank scenrio used in
-various places in the SCA specification documents.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-simple-bigbank.jar bigbank.client.BigBankClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-simple-bigbank.jar bigbank.client.BigBankClient
-
-
-Sample Overview
----------------
-The sample provides a composite with two java components wired together
-with a default binding. A request to the AccountComponent results in a
-request to the AccountDataComponent to get account data. The data returns
-back via the AccountComponent to the client.
-
-calculator/
- src/
- main/
- java/
- bigbank/
- account/ - AccountComponent implementation
- accountdata/ - AccountDataComponent implementation
- client/ - starts the SCA Runtime and
- deploys the BigBank.composite.
- It then calls the deployed AccountService
- resources/
- Account.composite - SCA assembly for this sample
- BigBank.composite - SCA assembly for this sample
- StockQuote.composite - SCA assembly for this sample
- test/
- java/
- bigbank/
- BigBankTestCase.java - JUnit test case
- simple-bigbank.png - a pictorial representation of the sample
- .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd simple-bigbank
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Account summary: currency: USD, [ID:Foo_CHA12345, balance:1500.0, ID
-:Foo_SAA12345, balance:1500.0, ID:Foo_STA12345, symbol:IBM, quantity:100]
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd simple-bigbank
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running bigbank.BigBankTestCase
-Account summary: currency: USD, [ID:Foo_CHA12345, balance:1500.0, ID:Foo_SAA1234
-5, balance:1500.0, ID:Foo_STA12345, symbol:IBM, quantity:100, balance:10432.0]]
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.592 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/build.xml b/branches/sca-java-0.99/samples/simple-bigbank/build.xml
deleted file mode 100644
index a814014eae..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="simple-bigbank" default="compile">
- <property name="test.class" value="bigbank.client.BigBankClient" />
- <property name="test.jar" value="sample-simple-bigbank.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/pom.xml b/branches/sca-java-0.99/samples/simple-bigbank/pom.xml
deleted file mode 100644
index a1e0307c41..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-simple-bigbank</artifactId>
- <name>Apache Tuscany Simplified BigBank Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.png b/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.png
deleted file mode 100644
index 593c047f6a..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.svg b/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.svg
deleted file mode 100644
index c64f6de6b9..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/simple-bigbank.svg
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-bigbank"
- sodipodi:docname="simple-bigbank.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-bigbank\simple-bigbank.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="468.4064"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="120"
- inkscape:window-y="172" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997">
- <rect
- rx="15.307091"
- ry="12.692303"
- y="192.00233"
- x="258.31146"
- height="299.99988"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">BigBank</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="339.91632"
- y="310.73904"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(84.32554,112.8005)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Account</flowPara><flowPara
- id="flowPara1883">Service</flowPara><flowPara
- id="flowPara1885">Component</flowPara></flowRoot> <rect
- style="opacity:1;fill:#fff62c;fill-opacity:1;stroke:#060000;stroke-width:0.99999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3006"
- width="43.861084"
- height="29.993773"
- x="376.59262"
- y="285.79593"
- rx="21.930542"
- ry="0" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 436.01825,340.74775 L 469.35329,340.74775 L 475.4142,353.87973 L 468.34314,366.00157 L 436.01825,366.00157 L 443.5944,353.87973 L 436.01825,340.74775 z "
- id="path3019" />
- <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 226.73063,330.75341 L 280.61512,330.75341 L 290.41229,356.14253 L 278.98226,379.57867 L 226.73063,379.57867 L 238.97711,356.14253 L 226.73063,330.75341 z "
- id="path1887" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1889"
- width="115.66247"
- height="85.862968"
- x="557.25488"
- y="308.38455"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1891"
- transform="translate(301.6641,110.446)"><flowRegion
- id="flowRegion1893"><rect
- id="rect1895"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1897">Account</flowPara><flowPara
- id="flowPara1909">Data</flowPara><flowPara
- id="flowPara1899">Service</flowPara><flowPara
- id="flowPara1901">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 540.10438,340.23154 L 573.43942,340.23154 L 579.50033,353.36352 L 572.42927,365.48536 L 540.10438,365.48536 L 547.68053,353.36352 L 540.10438,340.23154 z "
- id="path1905" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 290,355.52305 C 329.28571,355.52305 329.28571,355.52305 329.28571,355.52305"
- id="path1913" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 475,353.3802 C 547.14286,352.66591 547.14286,352.66591 547.14286,352.66591"
- id="path1919" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1921"
- transform="translate(95.23912,80.79069)"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1923"><rect
- id="rect1925"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1931">currency</flowPara></flowRoot> <flowRoot
- xml:space="preserve"
- id="flowRoot1933"
- transform="translate(-42.61803,130.0764)"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1935"><rect
- id="rect1937"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1939">Account</flowPara><flowPara
- id="flowPara1941">Service</flowPara><flowPara
- id="flowPara1943" /></flowRoot> </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
deleted file mode 100644
index 1625ff5b65..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.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 bigbank.account;
-
-import java.util.List;
-
-/**
- */
-public class AccountReport {
- private List<String> summaries;
- private String currency;
-
- public AccountReport(String currency, List<String> summaries) {
- this.currency = currency;
- this.summaries = summaries;
- }
-
- public List getAccountSummaries() { return summaries; }
-
- public String getCurrency() { return currency; }
-
- @Override
- public String toString() {
- return "currency: "+ currency + ", " + summaries;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
deleted file mode 100644
index 7c9082b944..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account;
-
-/**
- * Interface for a account service
- */
-public interface AccountService {
- public AccountReport getAccountReport(String customerID);
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
deleted file mode 100644
index fa85f309c0..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.account;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-import bigbank.accountdata.AccountDataService;
-import bigbank.accountdata.CheckingAccount;
-import bigbank.accountdata.SavingsAccount;
-import bigbank.accountdata.StockAccount;
-import bigbank.stockquote.StockQuoteService;
-
-/**
- * Account service implementation
- */
-public class AccountServiceImpl implements AccountService {
-
- @Reference
- public AccountDataService accountDataService;
-
- @Reference
- public StockQuoteService stockQuoteService;
-
- @Property
- public String currency;
-
- public AccountReport getAccountReport(String s) {
- List<String> summaries = new ArrayList<String>();
-
- CheckingAccount ca = accountDataService.getCheckingAccount(s);
- summaries.add(ca.getSummary());
-
- SavingsAccount sa = accountDataService.getSavingsAccount(s);
- summaries.add(sa.getSummary());
-
- StockAccount sk = accountDataService.getStockAccount(s);
-
- double price = stockQuoteService.getQuote(sk.getSymbol());
- sk.setBalance(sk.getQuantity() * price);
-
- summaries.add(sk.getSummary());
-
- AccountReport report = new AccountReport(currency, summaries);
-
- return report;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
deleted file mode 100644
index a5ae7b3955..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package bigbank.accountdata;
-
-/**
- * Interface for a account service
- */
-public interface Account {
- String getSummary();
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
deleted file mode 100644
index c354de387b..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.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 bigbank.accountdata;
-
-/**
- * Interface for a account data service
- */
-public interface AccountDataService {
- public CheckingAccount getCheckingAccount(String customerID);
- public SavingsAccount getSavingsAccount(String customerID);
- public StockAccount getStockAccount(String customerID);
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
deleted file mode 100644
index 000acb935c..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.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 bigbank.accountdata;
-
-
-/**
- * Account data service implementation
- */
-public class AccountDataServiceImpl implements AccountDataService {
-
- public CheckingAccount getCheckingAccount(String customerID) {
-
- CheckingAccount checkingAccount = new CheckingAccount();
- checkingAccount.setAccountNumber(customerID+"_"+"CHA12345");
- checkingAccount.setBalance(1500.0f);
-
- return checkingAccount;
- }
-
- public SavingsAccount getSavingsAccount(String customerID) {
-
- SavingsAccount savingsAccount = new SavingsAccount();
- savingsAccount.setAccountNumber(customerID+"_"+"SAA12345");
- savingsAccount.setBalance(1500.0f);
-
- return savingsAccount;
- }
-
- public StockAccount getStockAccount(String customerID) {
-
- StockAccount stockAccount = new StockAccount();
- stockAccount.setAccountNumber(customerID+"_"+"STA12345");
- stockAccount.setSymbol("IBM");
- stockAccount.setQuantity(100);
-
- return stockAccount;
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
deleted file mode 100644
index 11bdff757e..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.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 bigbank.accountdata;
-
-/**
- * An account service implementation for a checking account
- */
-public class CheckingAccount implements Account {
- private String accountNumber;
- private double balance;
-
- public String getAccountNumber() { return accountNumber; }
- public void setAccountNumber(String n) { this.accountNumber = n; }
-
- public double getBalance() { return balance; }
- public void setBalance(double b) { this.balance = b; }
-
- public String getSummary() { return "ID:" + accountNumber + ", balance:" + balance; }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
deleted file mode 100644
index b791024076..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.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 bigbank.accountdata;
-
-/**
- * An account service implementation for a savings account
- */
-public class SavingsAccount implements Account {
- private String accountNumber;
- private double balance;
-
- public String getAccountNumber() { return accountNumber; }
- public void setAccountNumber(String n) { this.accountNumber = n; }
-
- public double getBalance() { return balance; }
- public void setBalance(double b) { this.balance = b; }
-
- public String getSummary() { return "ID:" + accountNumber + ", balance:" + balance; }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
deleted file mode 100644
index 86246a3f84..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.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 bigbank.accountdata;
-
-/**
- * An account service implementation for a stock account
- */
-public class StockAccount implements Account {
- private String accountNumber;
- private String symbol;
- private int quantity;
- private double balance;
-
- public String getAccountNumber() { return accountNumber; }
- public void setAccountNumber(String n) { this.accountNumber = n; }
-
- public double getQuantity() { return quantity; }
- public void setQuantity(int a) { this.quantity = a; }
-
- public String getSymbol() { return symbol; }
- public void setSymbol(String s) { this.symbol = s; }
-
- public double getBalance() { return balance; }
- public void setBalance(double balance) { this.balance = balance; }
-
- public String getSummary() { return "ID:" + accountNumber + ", symbol:" + symbol + ", quantity:" + quantity + ", balance:" + balance; }
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
deleted file mode 100644
index edbf910d37..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.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 bigbank.client;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import bigbank.account.AccountService;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class BigBankClient {
- public static void main(String[] args) throws Exception {
-
- SCADomain scaDomain = SCADomain.newInstance("BigBank.composite");
-
- AccountService accountService = scaDomain.getService(AccountService.class,
- "AccountServiceComponent");
-
- System.out.println("Account summary: " + accountService.getAccountReport("Foo") );
-
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
deleted file mode 100644
index 0512d40b0b..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.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 bigbank.stockquote;
-
-
-/**
- * This class implements the StockQuote service.
- */
-public class StockQuoteImpl implements StockQuoteService {
-
- public double getQuote(String symbol) {
- double price = 104.0 + Math.random();
- price = ((int)(price * 100)) / 100.0;
-
- System.out.println("Getting stock quote for: " + symbol + ", value: "+ price);
-
- return price;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
deleted file mode 100644
index 7961279352..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.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 bigbank.stockquote;
-
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * This is the business interface of the StockQuote service.
- */
-@Remotable
-public interface StockQuoteService {
-
- public double getQuote(String symbol);
-}
-
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/Account.composite b/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/Account.composite
deleted file mode 100644
index e71615e27e..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/Account.composite
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://account"
- name="Account">
-
- <service name="AccountService" promote="AccountServiceComponent"/>
-
- <component name="AccountServiceComponent">
- <implementation.java class="bigbank.account.AccountServiceImpl"/>
- <reference name="accountDataService" target="AccountDataServiceComponent"/>
- <property name="currency">USD</property>
- </component>
-
- <component name="AccountDataServiceComponent">
- <implementation.java class="bigbank.accountdata.AccountDataServiceImpl"/>
- </component>
-
- <reference name="stockQuoteService" promote="AccountServiceComponent/stockQuoteService"/>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/BigBank.composite b/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/BigBank.composite
deleted file mode 100644
index c870f39cab..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://bigbank"
- xmlns:a="http://account"
- xmlns:s="http://stockquote"
- name="BigBank">
-
- <component name="AccountServiceComponent">
- <implementation.composite name="a:Account"/>
- <reference name="stockQuoteService" target="StockQuoteServiceComponent"/>
- </component>
-
- <component name="StockQuoteServiceComponent">
- <implementation.composite name="s:StockQuote"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/StockQuote.composite b/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/StockQuote.composite
deleted file mode 100644
index 4f29c14851..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/main/resources/StockQuote.composite
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://stockquote"
- name="StockQuote">
-
- <service name="StockQuoteService" promote="StockQuoteServiceComponent"/>
-
- <component name="StockQuoteServiceComponent">
- <implementation.java class="bigbank.stockquote.StockQuoteImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/branches/sca-java-0.99/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
deleted file mode 100644
index ba6c1dd797..0000000000
--- a/branches/sca-java-0.99/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.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 bigbank;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import bigbank.account.AccountService;
-
-/**
- * Tests out the big bank service
- *
- */
-public class BigBankTestCase extends TestCase {
-
- private SCADomain scaDomain;
- AccountService accountService;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("BigBank.composite");
- accountService = scaDomain.getService(AccountService.class, "AccountServiceComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void test() throws Exception {
- System.out.println("Account summary: " + accountService.getAccountReport("Foo") );
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/README b/branches/sca-java-0.99/samples/simple-callback-ws/README
deleted file mode 100644
index 85cd90afef..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/README
+++ /dev/null
@@ -1,134 +0,0 @@
-Simple Callback Sample Using Web Services
-=========================================
-This sample demonstrates asynchronous messaging using a callback over the
-Web Service binding. It is very similar to the simple-callback sample.
-The only differences are that simplecallback.composite has been updated
-to use the Web Service binding, and there is a simplecallback.wsdl file.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-simple-callback.jar simplecallback.SimpleCallbackClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-simple-callback.jar simplecallback.SimpleCallbackClient
-
-
-Sample Overview
----------------
-The sample provides a single composite with two components. MyClientComponent is
-wired to MyServiceComponent. The interface of MyServiceComponent describes one
-method as ONEWAY and with a callback semantic. When a message passes from
-client to service the response is returned via the callback asynchronously.
-
-simple-callback/
- src/
- main/
- java/
- simplecallback/
- MyClient.java - client interface
- MyClientImpl.java - implements the client and service callback
- interfaces
- MyService.java - service interface
- MyServiceCallback.java - service callback interface, implemented by the
- client
- MyServiceImpl.java - implements the service interface
- SimpleCallbackClient.java - starts the SCA Runtime and
- deploys the simplecallback.composite.
- It then calls MyClientComponent which in turn
- calls MyServiceComponent
- resources/
- simplecallback.composite - the SCA assembly for this sample
- wsdl/
- simplecallback.wsdl - the service description and callback binding
- test/
- java/
- simplecallback/
- SimpleCallbackTestCase.java - JUnit test case
- simple-callback.png - a pictorial representation of the sample
- .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd simple-callback-ws
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] Main thread Thread[main,5,main]
- [java] aClientMethod on thread Thread[main,5,main]
- [java] setMyServiceCallback on thread Thread[pool-1-thread-3,5,main]
- [java] someMethod on thread Thread[pool-1-thread-3,5,main]
- [java] receiveResult on thread Thread[Axis2 Task,5,main]
- [java] Result: -> someMethod -> receiveResult
- [java] aClientMethod return from someMethod on thread Thread[main,5,main]
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd simple-callback-ws
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running simplecallback.SimpleCallbackTestCase
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAXUtils).
-log4j:WARN Please initialize the log4j system properly.
-01-Jul-2007 21:20:06 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-01-Jul-2007 21:20:07 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-01-Jul-2007 21:20:07 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-01-Jul-2007 21:20:07 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd
-01-Jul-2007 21:20:07 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd
-01-Jul-2007 21:20:07 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd
-01-Jul-2007 21:20:07 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xsd
-01-Jul-2007 21:20:07 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8080
-01-Jul-2007 21:20:07 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8080
-Main thread Thread[main,5,main]
-aClientMethod on thread Thread[main,5,main]
-setMyServiceCallback on thread Thread[pool-1-thread-1,5,main]
-someMethod on thread Thread[pool-1-thread-1,5,main]
-aClientMethod return from someMethod on thread Thread[main,5,main]
-Sleeping ...
-receiveResult on thread Thread[Axis2 Task,5,main]
-Result: -> someMethod -> receiveResult
-01-Jul-2007 21:20:08 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8080
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.525 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/build.xml b/branches/sca-java-0.99/samples/simple-callback-ws/build.xml
deleted file mode 100644
index 10b69bd395..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="simple-callback-ws" default="compile">
- <property name="test.class" value="simplecallback.SimpleCallbackClient" />
- <property name="test.jar" value="sample-simple-callback-ws.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/pom.xml b/branches/sca-java-0.99/samples/simple-callback-ws/pom.xml
deleted file mode 100644
index 8e0e8195a3..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-simple-callback-ws</artifactId>
- <name>Apache Tuscany Simple Callback Web Services Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-http-tomcat</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.png b/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.png
deleted file mode 100644
index 1b6353f5cf..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.svg b/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.svg
deleted file mode 100644
index 7d9e3de510..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/simple-callback-ws.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-callback"
- sodipodi:docname="simple-callback.svg"
- version="1.0">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="375"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="74"
- inkscape:window-y="306" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997">
- <rect
- rx="15.307091"
- ry="12.692303"
- y="192.00233"
- x="258.31146"
- height="299.99988"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">simplecallback</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1883"
- width="115.66247"
- height="85.862968"
- x="549.39777"
- y="308.7417"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1885"
- transform="translate(281.807,102.8031)"><flowRegion
- id="flowRegion1887"><rect
- id="rect1889"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1891">MyService</flowPara><flowPara
- id="flowPara1915">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 532.24723,340.58867 L 565.58227,340.58867 L 571.64318,353.72065 L 564.57212,365.84249 L 532.24723,365.84249 L 539.82338,353.72065 L 532.24723,340.58867 z "
- id="path1895" />
- </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="339.91632"
- y="310.73904"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(72.32554,104.8005)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">MyClient</flowPara><flowPara
- id="flowPara1913">Component</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 436.01825,340.74775 L 469.35329,340.74775 L 475.4142,353.87973 L 468.34314,366.00157 L 436.01825,366.00157 L 443.5944,353.87973 L 436.01825,340.74775 z "
- id="path3019" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 474.28571,353.3802 L 539.28571,354.09448"
- id="path1917"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-callback\simple-callback.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
deleted file mode 100644
index 4cc00d6d0f..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/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 simplecallback;
-
-/**
- * The client interface
- */
-public interface MyClient {
-
- void aClientMethod();
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
deleted file mode 100644
index b9479324ec..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.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 simplecallback;
-
-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 MyClientImpl implements MyClient, MyServiceCallback {
-
- private MyService myService;
- static String result;
-
- @Reference
- public void setMyService(MyService myService) {
- this.myService = myService;
- }
-
- public void aClientMethod() {
- System.out.println("aClientMethod on thread " + Thread.currentThread());
- myService.someMethod(" -> someMethod ");
- System.out.println("aClientMethod return from someMethod on thread " + Thread.currentThread());
- }
-
- public void receiveResult(String result) {
- System.out.println("receiveResult on thread " + Thread.currentThread());
- System.out.println("Result: " + result);
- MyClientImpl.result = result;
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
deleted file mode 100644
index 48acc0e94f..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyService.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 simplecallback;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This service that will be invoked in a non-blocking fashion
- */
-@Remotable
-@Callback(MyServiceCallback.class)
-public interface MyService {
-
- @OneWay
- void someMethod(String arg);
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
deleted file mode 100644
index 66cfb2bc8a..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.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 simplecallback;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The callback interface for {@link MyService}.
- */
-@Remotable
-public interface MyServiceCallback {
-
- void receiveResult(String result);
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
deleted file mode 100644
index 3817eb15b0..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.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 simplecallback;
-
-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) {
- System.out.println("setMyServiceCallback on thread " + Thread.currentThread());
- this.myServiceCallback = myServiceCallback;
- }
-
- public void someMethod(String arg) {
- System.out.println("someMethod on thread " + Thread.currentThread());
- // invoke the callback
- try {
- myServiceCallback.receiveResult(arg + " -> receiveResult ");
- } catch(RuntimeException e) {
- System.out.println("RuntimeException invoking receiveResult: " + e.toString());
- e.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
deleted file mode 100644
index eeb0e52163..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.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 simplecallback;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Demonstrates resolving the client service and initiating the callback sequence
- */
-public class SimpleCallbackClient {
-
- public static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("simplecallback.composite");
- MyClient myClient = scaDomain.getService(MyClient.class, "MyClientComponent");
-
- System.out.println("Main thread " + Thread.currentThread());
- myClient.aClientMethod();
- Thread.sleep(1000);
-
- scaDomain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/simplecallback.composite
deleted file mode 100644
index 8bc5bddfe2..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://simplecallback"
- xmlns:cb="http://simplecallback"
- name="simplecallback">
-
- <component name="MyClientComponent">
- <reference name="myService">
- <interface.java interface="simplecallback.MyService"
- callbackInterface="simplecallback.MyServiceCallback" />
- <binding.ws wsdlElement="http://simplecallback#wsdl.port(MyServiceSoapService/MyServiceSoapPort)" />
- <callback>
- <binding.ws wsdlElement="http://simplecallback#wsdl.binding(MyServiceCallbackSoapBinding)" />
- </callback>
- </reference>
- <implementation.java class="simplecallback.MyClientImpl" />
- </component>
-
- <component name="MyServiceComponent">
- <service name="MyService">
- <interface.wsdl interface="http://simplecallback#wsdl.interface(MyService)"
- callbackInterface="http://simplecallback#wsdl.interface(MyServiceCallback)" />
- <binding.ws wsdlElement="http://simplecallback#wsdl.port(MyServiceSoapService/MyServiceSoapPort)" />
- <callback>
- <binding.ws wsdlElement="http://simplecallback#wsdl.binding(MyServiceCallbackSoapBinding)" />
- </callback>
- </service>
- <implementation.java class="simplecallback.MyServiceImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
deleted file mode 100644
index 243737dd70..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<wsdl:definitions targetNamespace="http://simplecallback" xmlns:tns="http://simplecallback" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="simplecallback">
-
- <wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://simplecallback" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <element name="someMethod">
- <complexType>
- <sequence>
- <element name="name" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="receiveResult">
- <complexType>
- <sequence>
- <element name="name" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="receiveResultResponse">
- <complexType/>
- </element>
-
- </schema>
- </wsdl:types>
-
- <wsdl:message name="someMethodRequest">
- <wsdl:part element="tns:someMethod" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="receiveResultRequest">
- <wsdl:part element="tns:receiveResult" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="receiveResultResponse">
- <wsdl:part element="tns:receiveResultResponse" name="parameters"/>
- </wsdl:message>
-
- <wsdl:portType name="MyService">
- <wsdl:operation name="someMethod">
- <wsdl:input message="tns:someMethodRequest" name="someMethodRequest"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:portType name="MyServiceCallback">
- <wsdl:operation name="receiveResult">
- <wsdl:input message="tns:receiveResultRequest" name="receiveResultRequest"/>
- <wsdl:output message="tns:receiveResultResponse" name="receiveResultResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="MyServiceSoapBinding" type="tns:MyService">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="someMethod">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="someMethodRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:binding name="MyServiceCallbackSoapBinding" type="tns:MyServiceCallback">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="receiveResult">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="receiveResultRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="receiveResultResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="MyServiceSoapService">
- <wsdl:port binding="tns:MyServiceSoapBinding" name="MyServiceSoapPort">
- <wsdlsoap:address location="http://localhost:8085/MyServiceComponent"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-java-0.99/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/branches/sca-java-0.99/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
deleted file mode 100644
index 413737346e..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package simplecallback;
-
-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 SimpleCallbackTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private MyClient myClient;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("simplecallback.composite");
- myClient = scaDomain.getService(MyClient.class, "MyClientComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void test() throws Exception {
- System.out.println("Main thread " + Thread.currentThread());
- myClient.aClientMethod();
- System.out.println("Sleeping ...");
- Thread.sleep(1300);
- assertEquals("-> someMethod -> receiveResult", MyClientImpl.result);
- }
-}
-
-
diff --git a/branches/sca-java-0.99/samples/simple-callback/README b/branches/sca-java-0.99/samples/simple-callback/README
deleted file mode 100644
index 719376f254..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/README
+++ /dev/null
@@ -1,97 +0,0 @@
-Simple Callback Sample
-======================
-This sample demonstrates asynchronous messaging using a callback.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-simple-callback.jar simplecallback.SimpleCallbackClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-simple-callback.jar simplecallback.SimpleCallbackClient
-
-
-Sample Overview
----------------
-The sample provides a single composite with two components. MyClientComponent is
-wired to MyServiceComponent. The interface of MyServiceComponent describes one
-method as ONEWAY and with a callback semantic. When a message passes from
-client to service the response is returned via the callback asynchronously.
-
-simple-callback/
- src/
- main/
- java/
- simplecallback/
- MyClient.java - client interface
- MyClientImpl.java - implements the client and service callback
- interfaces
- MyService.java - service interface
- MyServiceCallback.java - service callback interface, implemented by the
- client
- MyServiceImpl.java - implements the service interface
- SimpleCallbackClient.java - starts the SCA Runtime and
- deploys the simplecallback.composite.
- It then calls MyClientComponent which in turn
- calls MyServiceComponent
- resources/
- simplecallback.composite - the SCA assembly for this sample
- test/
- java/
- simplecallback/
- SimpleCallbackTestCase.java - JUnit test case
- simple-callback.png - a pictorial representation of the sample
- .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd simple-callback
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Main thread Thread[main,5,main]
- [java] Work thread Thread[pool-1-thread-1,5,main]
- [java] Result: -> someMethod -> receiveResult
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd simple-callback
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running simplecallback.SimpleCallbackTestCase
-Main thread Thread[main,5,main]
-Sleeping ...
-Work thread Thread[pool-1-thread-1,5,main]
-Result: -> someMethod -> receiveResult
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.692 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-0.99/samples/simple-callback/build.xml b/branches/sca-java-0.99/samples/simple-callback/build.xml
deleted file mode 100644
index 47d1ea4bc1..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="simple-callback" default="compile">
- <property name="test.class" value="simplecallback.SimpleCallbackClient" />
- <property name="test.jar" value="sample-simple-callback.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/simple-callback/pom.xml b/branches/sca-java-0.99/samples/simple-callback/pom.xml
deleted file mode 100644
index 52b4bf621f..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-simple-callback</artifactId>
- <name>Apache Tuscany Simple Callback Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/simple-callback/simple-callback.png b/branches/sca-java-0.99/samples/simple-callback/simple-callback.png
deleted file mode 100644
index 1b6353f5cf..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/simple-callback.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/simple-callback/simple-callback.svg b/branches/sca-java-0.99/samples/simple-callback/simple-callback.svg
deleted file mode 100644
index 484b65df9d..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/simple-callback.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-callback"
- sodipodi:docname="simple-callback.svg"
- version="1.0">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="375"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="74"
- inkscape:window-y="306" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997">
- <rect
- rx="15.307091"
- ry="12.692303"
- y="192.00233"
- x="258.31146"
- height="299.99988"
- width="495.71429"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">simplecallback</flowPara></flowRoot> <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1883"
- width="115.66247"
- height="85.862968"
- x="549.39777"
- y="308.7417"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1885"
- transform="translate(281.807,102.8031)"><flowRegion
- id="flowRegion1887"><rect
- id="rect1889"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1891">MyService</flowPara><flowPara
- id="flowPara1915">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 532.24723,340.58867 L 565.58227,340.58867 L 571.64318,353.72065 L 564.57212,365.84249 L 532.24723,365.84249 L 539.82338,353.72065 L 532.24723,340.58867 z "
- id="path1895" />
- </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="339.91632"
- y="310.73904"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(72.32554,104.8005)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">MyClient</flowPara><flowPara
- id="flowPara1913">Component</flowPara></flowRoot> <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 436.01825,340.74775 L 469.35329,340.74775 L 475.4142,353.87973 L 468.34314,366.00157 L 436.01825,366.00157 L 443.5944,353.87973 L 436.01825,340.74775 z "
- id="path3019" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 474.28571,353.3802 L 539.28571,354.09448"
- id="path1917"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-callback\simple-callback.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClient.java
deleted file mode 100644
index 4cc00d6d0f..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/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 simplecallback;
-
-/**
- * The client interface
- */
-public interface MyClient {
-
- void aClientMethod();
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
deleted file mode 100644
index 3e2a1df5a5..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.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 simplecallback;
-
-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 MyClientImpl implements MyClient, MyServiceCallback {
-
- private MyService myService;
- static String result;
-
- @Reference
- public void setMyService(MyService myService) {
- this.myService = myService;
- }
-
- public void aClientMethod() {
- myService.someMethod("-> someMethod");
- }
-
- public void receiveResult(String result) {
- System.out.println("Work thread " + Thread.currentThread());
- System.out.println("Result: " + result);
- MyClientImpl.result = result;
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyService.java b/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyService.java
deleted file mode 100644
index e78ad6f68f..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/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 simplecallback;
-
-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-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
deleted file mode 100644
index b27eea44f5..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/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 simplecallback;
-
-/**
- * The callback interface for {@link MyService}.
- */
-public interface MyServiceCallback {
-
- void receiveResult(String result);
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
deleted file mode 100644
index fc5e31d14e..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/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 simplecallback;
-
-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-0.99/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
deleted file mode 100644
index b8987fcd07..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.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 simplecallback;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Demonstrates resolving the client service and initiating the callback sequence
- */
-public class SimpleCallbackClient {
-
- public static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("simplecallback.composite");
- MyClient myClient = scaDomain.getService(MyClient.class, "MyClientComponent");
-
- System.out.println("Main thread " + Thread.currentThread());
- myClient.aClientMethod();
- Thread.sleep(500);
-
- scaDomain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/main/resources/simplecallback.composite b/branches/sca-java-0.99/samples/simple-callback/src/main/resources/simplecallback.composite
deleted file mode 100644
index 33e6f60601..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/src/main/resources/simplecallback.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://simplecallback"
- xmlns:cb="http://simplecallback"
- name="simplecallback">
-
- <component name="MyClientComponent">
- <implementation.java class="simplecallback.MyClientImpl"/>
- <reference name="myService" target="MyServiceComponent"/>
- </component>
-
- <component name="MyServiceComponent">
- <implementation.java class="simplecallback.MyServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/branches/sca-java-0.99/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
deleted file mode 100644
index cbaab8af83..0000000000
--- a/branches/sca-java-0.99/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.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 simplecallback;
-
-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 SimpleCallbackTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private MyClient myClient;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("simplecallback.composite");
- myClient = scaDomain.getService(MyClient.class, "MyClientComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void test() throws Exception {
- System.out.println("Main thread " + Thread.currentThread());
- myClient.aClientMethod();
- System.out.println("Sleeping ...");
- Thread.sleep(300);
- assertEquals("-> someMethod -> receiveResult", MyClientImpl.result);
- }
-}
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/pom.xml b/branches/sca-java-0.99/samples/spi-implementation-pojo/pom.xml
deleted file mode 100644
index 1bb4983999..0000000000
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-spi-implementation-java</artifactId>
- <name>Apache Tuscany Java Implementation SPI Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-extension-helper</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java b/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
deleted file mode 100644
index 73104c3166..0000000000
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.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 sample;
-
-
-public class JavaImplementation {
-
- private String className;
-
- public String getClass_() {
- return className;
- }
-
- public void setClass_(String className) {
- this.className = className;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java b/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
deleted file mode 100644
index 43efae32ca..0000000000
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.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 sample;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.spi.ImplementationActivator;
-import org.apache.tuscany.sca.spi.InvokerFactory;
-
-public class JavaImplementationActivator implements ImplementationActivator<JavaImplementation> {
-
- public Class<JavaImplementation> getImplementationClass() {
- return JavaImplementation.class;
- }
-
- public InvokerFactory createInvokerFactory(RuntimeComponent rc, ComponentType ct, JavaImplementation implementation) {
- return new JavaInvokerFactory(rc, ct, implementation);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
deleted file mode 100644
index d65d4c8e4a..0000000000
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.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 sample;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class JavaInvoker implements Invoker {
-
- protected Class clazz;
- protected Object instance;
- protected Operation operation;
-
- public JavaInvoker(Class clazz, Object instance, Operation operation) {
- this.clazz = clazz;
- this.instance = instance;
- this.operation = operation;
- }
-
- public Message invoke(Message msg) {
- try {
- msg.setBody(getMethod().invoke(instance, (Object[])msg.getBody()));
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- return msg;
- }
-
- protected Method getMethod() {
- for (Method method : clazz.getMethods()) {
- if (method.getName().equals(operation.getName())) {
- return method;
- }
- }
- throw new ServiceRuntimeException("no method found for operation: " + operation.getName());
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
deleted file mode 100644
index 198befa928..0000000000
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.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 sample;
-
-import org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.spi.InvokerFactory;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class JavaInvokerFactory implements InvokerFactory {
-
- protected Object instance;
- protected Class clazz;
-
- public JavaInvokerFactory(RuntimeComponent rc, ComponentType ct, JavaImplementation implementation) {
- try {
- this.clazz = Class.forName(implementation.getClass_());
- this.instance = clazz.newInstance();
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- }
-
- public Invoker createInvoker(Operation operation) {
- return new JavaInvoker(clazz, instance, operation);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator b/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
deleted file mode 100644
index 95ee37c1aa..0000000000
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# Implementation class for the ExtensionActivator
-sample.JavaImplementationActivator
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java b/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index cc32929f09..0000000000
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package helloworld;
-
-public interface HelloWorld {
-
- String sayHello(String name);
-
-}
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java b/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 02af1ccf22..0000000000
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package helloworld;
-
-public class HelloWorldImpl implements HelloWorld {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index 5813fda330..0000000000
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- */
-public class HelloWorldTestCase extends TestCase {
-
- public void testHello() throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
- HelloWorld helloworld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent");
- assertEquals("Hello petra", helloworld.sayHello("petra"));
- scaDomain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite b/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index fa9cecc160..0000000000
--- a/branches/sca-java-0.99/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://test/helloworld"
- name="helloworld">
-
- <component name="HelloWorldComponent">
- <implementation.java class="helloworld.HelloWorldImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/supplychain/README b/branches/sca-java-0.99/samples/supplychain/README
deleted file mode 100644
index ea4493fdd4..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/README
+++ /dev/null
@@ -1,101 +0,0 @@
-SupplyChain Sample
-==================
-
-This sample demonstrates SCA components using the asynchronous API.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-supplychain.jar supplychain.SupplyChainClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-supplychain.jar supplychain.SupplyChainClient
-
-
-Sample Overview
----------------
-
-The sample provides a Customer service with a purchaseGoods operation
-and a notifyShipment operation annotated with the SCA @OneWay annotation.
-The SupplyChainClient exercises this interface by calling the
-purchaseGoods operation. This results in messages passing to
-the Retailer, Warehouse, and Shipper components and the result returned
-to the Customer service on a separate callback thread.
-
-supplychain/
- src/
- main/
- java/
- supplychain/
- Customer.java - Defines the Java interface implemented
- by the Customer component
- CustomerComponentImpl.java - Implements the SCA Customer component
- Retailer.java - Defines the Java interface implemented
- by the Retailer component
- RetailerComponentImpl.java - Implements the SCA RetailerComponent component
- Shipper.java - Defines the Java interface implemented
- by the Shipper component
- ShipperComponentImpl.java - Implements the SCA ShipperComponent component
- SupplyChainClient.java - SupplyChainClient.java loads SCA runtime
- Warehouse.java - Defines the Java interface implemented
- by the Warehouse component
- WarehouseComponentImpl.java - Implements the SCA WarehouseComponent component
-
- resources/
- supplychain.composite - the SCA assembly for this sample
- test/
- java/
- supplychain/
- SupplyChainClientTestCase.java - JUnit test case
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd supplychain
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Main thread Thread[main,5,main]
- [java] Main thread sleeping ...
- [java] Work thread Thread[pool-1-thread-1,5,main] - Order, submitted, fulfilled, shipped
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd supplychain
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running supplychain.SupplyChainClientTestCase
-Main thread Thread[main,5,main]
-Sleeping ...
-Work thread Thread[pool-1-thread-1,5,main] - Order, submitted, fulfilled, shipped
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.625 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully. \ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/supplychain/build.xml b/branches/sca-java-0.99/samples/supplychain/build.xml
deleted file mode 100644
index 506180b8b1..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project name="sample-supplychain" default="compile">
- <property name="test.class" value="supplychain.SupplyChainClient" />
- <property name="test.jar" value="sample-supplychain.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/supplychain/pom.xml b/branches/sca-java-0.99/samples/supplychain/pom.xml
deleted file mode 100644
index 85087e016a..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-supplychain</artifactId>
- <name>Apache Tuscany Supply Chain Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Customer.java b/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Customer.java
deleted file mode 100644
index 8088001898..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Customer.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 supplychain;
-
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-
- public void purchaseGoods();
-
- @OneWay
- public void notifyShipment(String order);
-
-}
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
deleted file mode 100644
index 7a1e8553ec..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.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 supplychain;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * This class implements the Customer service component.
- */
-public class CustomerComponentImpl implements Customer {
-
- private Retailer retailer;
-
- @Reference
- public void setRetailer(Retailer retailer) {
- this.retailer = retailer;
- }
-
- public void purchaseGoods() {
- retailer.submitOrder("Order");
- }
-
- public void notifyShipment(String order) {
- System.out.print("Work thread " + Thread.currentThread() + " - ");
- System.out.println(order);
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Retailer.java b/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Retailer.java
deleted file mode 100644
index 1add63fb4e..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-
- public void submitOrder(String order);
-
-}
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
deleted file mode 100644
index f622052cf8..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * This class implements the Customer service component.
- */
-public class RetailerComponentImpl implements Retailer {
-
- private Warehouse warehouse;
-
- @Reference
- public void setWarehouse(Warehouse warehouse) {
- this.warehouse = warehouse;
- }
-
- public void submitOrder(String order) {
- warehouse.fulfillOrder(order + ", submitted");
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Shipper.java b/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Shipper.java
deleted file mode 100644
index d4d49a922b..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-
- public void processShipment(String order);
-
-}
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
deleted file mode 100644
index 4ae52a12a2..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * This class implements the Warehouse service component.
- */
-public class ShipperComponentImpl implements Shipper {
-
- private Customer customer;
-
- @Reference
- public void setCustomer(Customer customer) {
- this.customer = customer;
- }
-
- public void processShipment(String order) {
- customer.notifyShipment(order + ", shipped");
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
deleted file mode 100644
index 7072f582d1..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate a Customer service component and invoke it.
- */
-public class SupplyChainClient {
-
- public static final void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("supplychain.composite");
- Customer customer = scaDomain.getService(Customer.class, "CustomerComponent");
-
- System.out.println("Main thread " + Thread.currentThread());
- customer.purchaseGoods();
- System.out.println("Main thread sleeping ...");
- Thread.sleep(1000);
-
- scaDomain.close();
- }
-}
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Warehouse.java b/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Warehouse.java
deleted file mode 100644
index 0be499f569..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-
- public void fulfillOrder(String order);
-
-}
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
deleted file mode 100644
index b5e256a1e0..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * This class implements the Warehouse service component.
- */
-public class WarehouseComponentImpl implements Warehouse {
-
- private Shipper shipper;
-
- @Reference
- public void setShipper(Shipper shipper) {
- this.shipper = shipper;
- }
-
- public void fulfillOrder(String order) {
- shipper.processShipment(order + ", fulfilled");
- }
-
-}
diff --git a/branches/sca-java-0.99/samples/supplychain/src/main/resources/supplychain.composite b/branches/sca-java-0.99/samples/supplychain/src/main/resources/supplychain.composite
deleted file mode 100644
index 301efcaf1f..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/main/resources/supplychain.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://supplychain"
- xmlns:sp="http://supplychain"
- name="supplychain">
-
- <component name="CustomerComponent">
- <implementation.java class="supplychain.CustomerComponentImpl" />
- <reference name="retailer" target="RetailerComponent"/>
- </component>
-
- <component name="RetailerComponent">
- <implementation.java class="supplychain.RetailerComponentImpl" />
- <reference name="warehouse" target="WarehouseComponent"/>
- </component>
-
- <component name="WarehouseComponent">
- <implementation.java class="supplychain.WarehouseComponentImpl" />
- <reference name="shipper" target="ShipperComponent"/>
- </component>
-
- <component name="ShipperComponent">
- <implementation.java class="supplychain.ShipperComponentImpl" />
- <reference name="customer" target="CustomerComponent"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/branches/sca-java-0.99/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
deleted file mode 100644
index 88e0eb7ab8..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package supplychain;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate a the Customer service component and invoke it.
- */
-public class SupplyChainClientTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private Customer customer;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("supplychain.composite");
- customer = scaDomain.getService(Customer.class, "CustomerComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void test() throws Exception {
-
- System.out.println("Main thread " + Thread.currentThread());
- customer.purchaseGoods();
- System.out.println("Sleeping ...");
- Thread.sleep(1000);
- }
-}
diff --git a/branches/sca-java-0.99/samples/supplychain/supplychain.png b/branches/sca-java-0.99/samples/supplychain/supplychain.png
deleted file mode 100644
index 51a384e827..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/supplychain.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-0.99/samples/supplychain/supplychain.svg b/branches/sca-java-0.99/samples/supplychain/supplychain.svg
deleted file mode 100644
index f72e77acab..0000000000
--- a/branches/sca-java-0.99/samples/supplychain/supplychain.svg
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\supplychain"
- sodipodi:docname="supplychain.svg"
- version="1.0">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="521.44872"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1128"
- inkscape:window-height="721"
- inkscape:window-x="89"
- inkscape:window-y="126" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(1.047575,0,0,1,-9.726882,0)">
- <rect
- rx="19.999123"
- ry="12.692303"
- y="192.00233"
- x="205.45438"
- height="299.99988"
- width="647.66394"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.95405793;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"
- transform="translate(-38.86527,-2.857143)"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">supplychain</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="241.34489"
- y="300.02475"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(-26.24589,94.08621)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Customer</flowPara><flowPara
- id="flowPara1939">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 224.19438,331.87174 L 257.52942,331.87174 L 263.59033,345.00372 L 256.51927,357.12556 L 224.19438,357.12556 L 231.77053,345.00372 L 224.19438,331.87174 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 337.44682,330.03346 L 370.78186,330.03346 L 376.84277,343.16544 L 369.77171,355.28728 L 337.44682,355.28728 L 345.02297,343.16544 L 337.44682,330.03346 z "
- id="path3019" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1897"
- width="115.66247"
- height="85.862968"
- x="405.82632"
- y="298.30585"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1899"
- transform="translate(138.2355,92.36731)"><flowRegion
- id="flowRegion1901"><rect
- id="rect1903"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1905">Retailer</flowPara><flowPara
- id="flowPara1941">Component </flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 388.67581,330.15284 L 422.01085,330.15284 L 428.07176,343.28482 L 421.0007,355.40666 L 388.67581,355.40666 L 396.25196,343.28482 L 388.67581,330.15284 z "
- id="path1907" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 501.92825,328.31456 L 535.26329,328.31456 L 541.3242,341.44654 L 534.25314,353.56838 L 501.92825,353.56838 L 509.5044,341.44654 L 501.92825,328.31456 z "
- id="path1909" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1911"
- width="115.66247"
- height="85.862968"
- x="567.96918"
- y="296.87729"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1913"
- transform="translate(300.3784,90.93874)"><flowRegion
- id="flowRegion1915"><rect
- id="rect1917"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1919">Wharehouse</flowPara><flowPara
- id="flowPara1943">Component </flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 550.81867,328.72427 L 584.15371,328.72427 L 590.21462,341.85625 L 583.14356,353.97809 L 550.81867,353.97809 L 558.39482,341.85625 L 550.81867,328.72427 z "
- id="path1921" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 664.07111,326.88599 L 697.40615,326.88599 L 703.46706,340.01797 L 696.396,352.13981 L 664.07111,352.13981 L 671.64726,340.01797 L 664.07111,326.88599 z "
- id="path1923" />
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect1925"
- width="115.66247"
- height="85.862968"
- x="727.96918"
- y="294.73444"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1927"
- transform="translate(460.3784,88.79589)"><flowRegion
- id="flowRegion1929"><rect
- id="rect1931"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara1933">Shipper</flowPara><flowPara
- id="flowPara1945">Component </flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 710.81866,326.58142 L 744.1537,326.58142 L 750.21461,339.7134 L 743.14355,351.83524 L 710.81866,351.83524 L 718.39481,339.7134 L 710.81866,326.58142 z "
- id="path1935" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 824.0711,324.74314 L 857.40614,324.74314 L 863.46705,337.87512 L 856.39599,349.99696 L 824.0711,349.99696 L 831.64725,337.87512 L 824.0711,324.74314 z "
- id="path1937" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 376.42857,343.3802 C 395.71429,343.3802 395.71429,343.3802 395.71429,343.3802"
- id="path1947" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 540.71429,341.23734 C 557.85714,341.23734 557.85714,341.23734 557.85714,341.23734"
- id="path1949" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 702.14286,340.52305 C 717.85714,340.52305 717.85714,340.52305 717.85714,340.52305"
- id="path1951" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 863.57143,337.66591 C 875.71429,337.66591 875.71429,337.66591 875.71429,337.66591 L 875,427.66591 L 212.14286,429.09448 L 210.71429,344.09448 L 231.42857,344.09448"
- id="path1953"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\supplychain\supplychain.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84" />
- </g>
-</svg>
diff --git a/branches/sca-java-0.99/samples/web-resource/README b/branches/sca-java-0.99/samples/web-resource/README
deleted file mode 100644
index 616cfc6af8..0000000000
--- a/branches/sca-java-0.99/samples/web-resource/README
+++ /dev/null
@@ -1,72 +0,0 @@
-Web Resource Component Sample
-======================================
-This sample demonstrates an SCA Web resource component.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-web-resource.jar web.resource.SampleServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-web-resource.jar web.resource.SampleServer
-
-Now the server is started you can point your Web browser to the URL of the Web resource.
-
-Sample Overview
----------------
-The sample provides a single component exposing a Web resource.
-
-web-resource/
- src/
- main/
- java/
- web/resource/
- SampleServer.java - starts the SCA Runtime and
- deploys the WebResource.composite
- resources/
- myContent/
- index.html - a Web HTML resource
- WebResource.composite - the SCA assembly for this sample
- web-resource.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant using the
-following commands
-
-cd web-resource
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Added Servlet mapping: http://localhost:8080/myWeb/*
- [java] Sample server started (press enter to shutdown)
-
- [java] To get the Web resource, point your Web browser to the following address:
- [java] http://localhost:8080/MyWeb/index.html
-
-As this point the Web resource is exposed by a web server started automatically
-by the SCA runtime. To stop the server just press enter.
-
-Building The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built using
-Maven as follows.
-
-cd web-resource
-mvn
-
diff --git a/branches/sca-java-0.99/samples/web-resource/build.xml b/branches/sca-java-0.99/samples/web-resource/build.xml
deleted file mode 100644
index e337acb215..0000000000
--- a/branches/sca-java-0.99/samples/web-resource/build.xml
+++ /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.
--->
-<project name="web-resource" default="compile">
- <property name="test.class" value="web.resource.SampleServer" />
- <property name="test.jar" value="sample-web-resource.jar" />
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java"
- destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${test.jar}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${test.class}" />
- </manifest>
- </jar>
- </target>
-
- <target name="run-classes" depends="compile">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run" depends="run-classes">
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-0.99/samples/web-resource/pom.xml b/branches/sca-java-0.99/samples/web-resource/pom.xml
deleted file mode 100644
index dc6be5c6a0..0000000000
--- a/branches/sca-java-0.99/samples/web-resource/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-samples</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>sample-web-resource</artifactId>
- <name>Apache Tuscany Web Resource Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-resource</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-http</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-http-tomcat</artifactId>
- <version>0.99-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-0.99/samples/web-resource/src/main/java/web/resource/SampleServer.java b/branches/sca-java-0.99/samples/web-resource/src/main/java/web/resource/SampleServer.java
deleted file mode 100644
index 9410de08c4..0000000000
--- a/branches/sca-java-0.99/samples/web-resource/src/main/java/web/resource/SampleServer.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 web.resource;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class SampleServer {
- public static void main(String[] args) throws Exception {
-
- SCADomain scaDomain = SCADomain.newInstance("WebResource.composite");
-
- try {
- System.out.println("Sample server started (press enter to shutdown)");
- System.out.println();
- System.out.println("To get the Web resource, point your Web browser to the following address:");
- System.out.println("http://localhost:8080/myWeb/index.html");
- System.out.println();
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- scaDomain.close();
- System.out.println("Sample server stopped");
- }
-}
diff --git a/branches/sca-java-0.99/samples/web-resource/src/main/resources/WebResource.composite b/branches/sca-java-0.99/samples/web-resource/src/main/resources/WebResource.composite
deleted file mode 100644
index 2376e79bf0..0000000000
--- a/branches/sca-java-0.99/samples/web-resource/src/main/resources/WebResource.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://web"
- name="WebResource">
-
- <component name="myWeb">
- <service name="Resource">
- <tuscany:binding.http/>
- </service>
- <tuscany:implementation.resource location="myContent"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-0.99/samples/web-resource/src/main/resources/myContent/index.html b/branches/sca-java-0.99/samples/web-resource/src/main/resources/myContent/index.html
deleted file mode 100644
index c6ea59af55..0000000000
--- a/branches/sca-java-0.99/samples/web-resource/src/main/resources/myContent/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
- <head>
- <title>Tuscany Sample Web Resource</TITLE>
- </head>
-
- <body>
- <h1>A Sample Web Resource</h1>
-
- <p>Tuscany allows you to publish Web resources using SCA components declared with an
- <b>&lt;implementation.resource&gt;</b> component implementation type and made available
- to HTTP clients using a <b>&lt;binding.http&gt;</b> binding.</p>
-
- <p>Here is the SCA composite that publishes this page:</p>
-
- <pre>
-&lt;composite xmlns=&quot;http://www.osoa.org/xmlns/sca/1.0&quot;
- targetNamespace=&quot;http://web&quot;
- name=&quot;WebResource&quot;&gt;
-
- &lt;component name=&quot;myWeb&quot;&gt;
- &lt;service name=&quot;Resource&quot;&gt;
- &lt;binding.http/&gt;
- &lt;/service&gt;
- &lt;implementation.resource location=&quot;myContent&quot;/&gt;
- &lt;/component&gt;
-
-&lt;/composite&gt;
- </pre>
-
- </body>
-</html>