summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/LICENSE251
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/META-INF/MANIFEST.MF29
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/NOTICE12
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/pom.xml48
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java50
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java27
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java34
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java79
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java167
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor19
-rw-r--r--sca-java-2.x/trunk/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory17
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/clients/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml11
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml22
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java22
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java20
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml13
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java20
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java7
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/maven-eclipse.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/creditcard.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite24
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java16
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-deployables/web.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/java/scatours/client/TestClient.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java20
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightImpl.java12
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml8
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml8
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml8
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml8
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml8
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml8
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help-pages.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/impl/HotelImpl.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/goodvaluetrips/Trips.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Bookings.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Checkout.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Updates.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/tours.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/Trips.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/trips.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/notification-corba.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java38
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java34
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java26
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java20
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java28
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java26
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java26
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/payment-client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java8
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java12
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java24
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/distribution/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java29
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml8
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java12
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java34
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java8
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java24
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java11
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java12
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java22
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java13
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml8
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java18
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java10
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml6
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java14
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/pom.xml12
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java24
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml4
382 files changed, 1804 insertions, 1115 deletions
diff --git a/sca-java-2.x/trunk/modules/implementation-script/LICENSE b/sca-java-2.x/trunk/modules/implementation-script/LICENSE
new file mode 100644
index 0000000000..4b5ab74408
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/LICENSE
@@ -0,0 +1,251 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+===============================================================================================================
+
+Apache Tuscany SCA for Java Subcomponents
+=========================================:
+
+The Tuscany SCA for Java release includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+=================================================================================================================
+
+This module implementation-script temporarily includes one file under the following BSD license:
+
+ Copyright (c) 2006, Sun Microsystems, Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ - Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ - Neither the name of the Sun Microsystems, Inc. nor the names of
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+=================================================================================================================
diff --git a/sca-java-2.x/trunk/modules/implementation-script/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/implementation-script/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..4b7bb9a472
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/META-INF/MANIFEST.MF
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0
+Export-Package: org.apache.tuscany.sca.implementation.script;uses:="ja
+ vax.xml.stream,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca
+ .contribution.resolver,org.apache.tuscany.sca.contribution.processor,
+ org.apache.tuscany.sca.core,org.apache.tuscany.sca.contribution,org.a
+ pache.tuscany.sca.monitor,javax.xml.namespace";version="2.0.0"
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Script Implementation Model
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0
+Bnd-LastModified: 1225397453750
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Script Implementation Model
+Import-Package: javax.xml.namespace,
+ javax.xml.stream,
+ org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.assembly.xml;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.implementation.script;version="2.0.0",
+ org.apache.tuscany.sca.monitor;version="2.0.0"
+Bundle-SymbolicName: org.apache.tuscany.sca.implementation.script
+Bundle-DocURL: http://www.apache.org/
+
diff --git a/sca-java-2.x/trunk/modules/implementation-script/NOTICE b/sca-java-2.x/trunk/modules/implementation-script/NOTICE
new file mode 100644
index 0000000000..ecbcc6a660
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/NOTICE
@@ -0,0 +1,12 @@
+${pom.name}
+Copyright (c) 2005 - 2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product also includes software under the BSD license
+(see the LICENSE file contained in this distribution), with
+the following copyright:
+
+Copyright (c) 2006, Sun Microsystems, Inc.
+All rights reserved.
diff --git a/sca-java-2.x/trunk/modules/implementation-script/pom.xml b/sca-java-2.x/trunk/modules/implementation-script/pom.xml
new file mode 100644
index 0000000000..84b81a57d7
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-implementation-script</artifactId>
+ <name>Apache Tuscany SCA Script Implementation Model</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly-xml</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
new file mode 100644
index 0000000000..543f852ef2
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sca.implementation.script;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.Base;
+import org.apache.tuscany.sca.assembly.Implementation;
+
+/**
+ * Represents a Script implementation.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface ScriptImplementation extends Implementation {
+ QName TYPE = new QName(Base.SCA11_TUSCANY_NS, "implementation.script");
+
+ String getScript();
+
+ void setScript(String script);
+
+ String getLocation();
+
+ void setLocation(String location);
+
+ void setLanguage(String language);
+
+ String getLanguage();
+
+ String getURI();
+
+ void setURI(String uri);
+
+}
diff --git a/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java b/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java
new file mode 100644
index 0000000000..c7a4c7fa2d
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.implementation.script;
+
+/**
+ *
+ */
+public interface ScriptImplementationFactory {
+ ScriptImplementation createScriptImplementation();
+}
diff --git a/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java b/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java
new file mode 100644
index 0000000000..d85d8924ba
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.implementation.script.impl;
+
+import org.apache.tuscany.sca.implementation.script.ScriptImplementation;
+import org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory;
+
+/**
+ *
+ */
+public class ScriptImplementationFactoryImpl implements ScriptImplementationFactory {
+
+ public ScriptImplementation createScriptImplementation() {
+ return new ScriptImplementationImpl();
+ }
+
+}
diff --git a/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java b/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java
new file mode 100644
index 0000000000..10821db972
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sca.implementation.script.impl;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.Base;
+import org.apache.tuscany.sca.assembly.impl.ImplementationImpl;
+import org.apache.tuscany.sca.implementation.script.ScriptImplementation;
+
+/**
+ * Represents a Script implementation.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ScriptImplementationImpl extends ImplementationImpl implements ScriptImplementation {
+ public static final QName TYPE = new QName(Base.SCA11_TUSCANY_NS, "implementation.script");
+
+ private String uri;
+ private String language;
+ private String location;
+
+ public ScriptImplementationImpl() {
+ super(TYPE);
+ }
+
+ public String getScript() {
+ return uri;
+ }
+
+ public void setScript(String uri) {
+ this.uri = uri;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public String getURI() {
+ return uri;
+ }
+
+ public void setURI(String uri) {
+ this.uri = uri;
+ }
+
+ @Override
+ public String toString() {
+ return "Script : " + getURI();
+ }
+}
diff --git a/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java b/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java
new file mode 100644
index 0000000000..18d3bfa4aa
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.implementation.script.xml;
+
+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.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.ContributionFactory;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.implementation.script.ScriptImplementation;
+import org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.Problem;
+import org.apache.tuscany.sca.monitor.Problem.Severity;
+
+/**
+ * ScriptImplementationProcessor
+ *
+ * @version $Rev: $ $Date: $
+ */
+public class ScriptImplementationProcessor implements StAXArtifactProcessor<ScriptImplementation> {
+ private static final QName IMPLEMENTATION_SCRIPT = ScriptImplementation.TYPE;
+
+ private AssemblyFactory assemblyFactory;
+ private ContributionFactory contributionFactory;
+ private ScriptImplementationFactory scriptImplementationFactory;
+
+ public ScriptImplementationProcessor(ExtensionPointRegistry registry) {
+ FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
+ assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+ contributionFactory = modelFactories.getFactory(ContributionFactory.class);
+ scriptImplementationFactory = modelFactories.getFactory(ScriptImplementationFactory.class);
+ }
+
+ public QName getArtifactType() {
+ return IMPLEMENTATION_SCRIPT;
+ }
+
+ public Class<ScriptImplementation> getModelType() {
+ return ScriptImplementation.class;
+ }
+
+ public ScriptImplementation read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
+
+ // Read an <implementation.script> element
+
+ // Create and initialize the script implementation model
+ ScriptImplementation implementation = scriptImplementationFactory.createScriptImplementation();
+ implementation.setUnresolved(true);
+
+ // Read the script attribute
+ String script = reader.getAttributeValue(null, "script");
+ if (script != null) {
+ implementation.setScript(script);
+ }
+
+ // Read the language attribute
+ String language = reader.getAttributeValue(null, "language");
+ if (language != null) {
+ implementation.setLanguage(language);
+ }
+
+ // Skip to end element
+ while (reader.hasNext()) {
+ if (reader.next() == END_ELEMENT && IMPLEMENTATION_SCRIPT.equals(reader.getName())) {
+ break;
+ }
+ }
+
+ return implementation;
+ }
+
+ public void resolve(ScriptImplementation implementation, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
+
+ // Resolve the script location
+ if (implementation.getScript() != null) {
+ Artifact artifact = contributionFactory.createArtifact();
+ artifact.setURI(implementation.getScript());
+ Artifact resolved = resolver.resolveModel(Artifact.class, artifact, context);
+ if (resolved.getLocation() != null) {
+ implementation.setLocation(resolved.getLocation());
+ } else {
+ error(context.getMonitor(), "CouldNotResolveScript", resolver, implementation.getScript());
+ }
+
+ // Resolve the componentType and add the declared properties, references
+ // and services to the implementation
+ String componentTypeURI = implementation.getScript();
+ componentTypeURI = componentTypeURI.substring(0, componentTypeURI.lastIndexOf('.'));
+ componentTypeURI += ".componentType";
+ ComponentType componentType = assemblyFactory.createComponentType();
+ componentType.setUnresolved(true);
+ componentType.setURI(componentTypeURI);
+ componentType = resolver.resolveModel(ComponentType.class, componentType, context);
+ if (!componentType.isUnresolved()) {
+ implementation.getProperties().addAll(componentType.getProperties());
+ implementation.getReferences().addAll(componentType.getReferences());
+ implementation.getServices().addAll(componentType.getServices());
+ }
+ }
+
+ implementation.setUnresolved(false);
+ }
+
+ public void write(ScriptImplementation implementation, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
+
+ // Write <implementation.script>
+ writer.setPrefix("script", IMPLEMENTATION_SCRIPT.getNamespaceURI());
+ writer.writeStartElement(IMPLEMENTATION_SCRIPT.getNamespaceURI(), IMPLEMENTATION_SCRIPT.getLocalPart());
+ writer.writeNamespace("script", IMPLEMENTATION_SCRIPT.getNamespaceURI());
+
+ if (implementation.getScript() != null) {
+ writer.writeAttribute("script", implementation.getScript());
+ }
+ if (implementation.getLanguage() != null) {
+ writer.writeAttribute("language", implementation.getLanguage());
+ }
+
+ writer.writeEndElement();
+ }
+
+ /**
+ * Report a error.
+ *
+ * @param problems
+ * @param message
+ * @param model
+ */
+ private void error(Monitor monitor, String message, Object model, Object... messageParameters) {
+ if (monitor != null) {
+ Problem problem = monitor.createProblem(this.getClass().getName(), "impl-widget-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
+ monitor.problem(problem);
+ }
+ }
+
+}
diff --git a/sca-java-2.x/trunk/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
new file mode 100644
index 0000000000..c3db94d4a8
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT 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.implementation.script.xml.ScriptImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#implementation.script,model=org.apache.tuscany.sca.implementation.script.ScriptImplementation \ No newline at end of file
diff --git a/sca-java-2.x/trunk/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory b/sca-java-2.x/trunk/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory
new file mode 100644
index 0000000000..5da5a817aa
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+org.apache.tuscany.sca.implementation.script.impl.ScriptImplementationFactoryImpl \ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml
index 4e665bb6a4..e6ad5e33a8 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-client-currency-converter-corba</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter CORBA Client</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml
index d936040939..a69b843bff 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-client-currency-converter-jms</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter JMS Client</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml
index 46f01ebcd9..18ed8ce4fa 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-client-currency-converter-rmi</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter RMI Client</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
index e2ffe7a09d..11eb5d52eb 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-client-currency-converter-ws-jaxws</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter Web Service JAX-WS Client</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/pom.xml
index 177da15528..ea2ed780ed 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/clients/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-clients</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Tours non-SCA Clients</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml
index c7f90cfba0..83b405584b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-blog-feed</artifactId>
<name>Apache Tuscany SCA Tours Blog Feed Contribution</name>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
</dependency>
@@ -56,16 +56,17 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-atom-abdera</artifactId>
+ <artifactId>tuscany-binding-atom-runtime</artifactId>
<version>${tuscany.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-rss-rome</artifactId>
<version>${tuscany.version}</version>
</dependency>
-
+-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/META-INF/sca-contribution.xml
index b4152d6e3f..1259a688e3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/META-INF/sca-contribution.xml
@@ -17,5 +17,5 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
</contribution> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite
index 751fd33cd2..8659e4bd4d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
name="blogFeed">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml
index 20a5d8bce4..443edb6215 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-buildingblocks-client</artifactId>
<name>Apache Tuscany SCA Tours Building Blocks Client Contribution</name>
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
@@ -72,14 +72,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>${tuscany.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-node-runtime</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
@@ -92,13 +85,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jms-asf</artifactId>
- <version>${tuscany.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
<version>5.2.0</version>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java
index e5e994b73c..9eb38a0a85 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java
@@ -18,7 +18,7 @@
*/
package scatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Bookings {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java
index 519b7779fa..af9d8a1bbb 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java
@@ -20,7 +20,7 @@ package scatours;
import java.math.BigDecimal;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Checkout {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java
index 278673c67d..cd46a8915a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java
@@ -21,8 +21,8 @@ package scatours.impl;
import java.math.BigDecimal;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import scatours.Bookings;
import scatours.Checkout;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java
index 16934872b9..d37860be3b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java
@@ -21,8 +21,8 @@ package scatours.impl;
import java.math.BigDecimal;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import scatours.Bookings;
import scatours.Checkout;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml
index e3f6effcee..183ffa816b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml
@@ -17,10 +17,10 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tst="http://tuscanyscatours.com/">
- <import namespace="http://tuscanyscatours.com/" />
<deployable composite="tst:ToursApplClient" />
<deployable composite="tst:ToursImplClient" />
<deployable composite="tst:ToursImplIncludeClient" />
+ <import namespace="http://tuscanyscatours.com/" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite
index b9f9d59f43..f0e33425e3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tst="http://tuscanyscatours.com/"
name="ToursApplClient">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite
index f8f0b3d4d1..6048ccda88 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tst="http://tuscanyscatours.com/"
name="ToursImplClient">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite
index 7310d0540d..49967db666 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tst="http://tuscanyscatours.com/"
name="ToursImplIncludeClient">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java
index 2cf08ec420..6115833182 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java
@@ -21,10 +21,10 @@ package scatours;
import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -35,7 +35,7 @@ import org.junit.Test;
public class BuildingBlocksApplTestCase {
private BrokerService jmsBroker;
- private SCANode node1, node2;
+ private Node node1, node2;
@Before
public void startServer() throws Exception {
@@ -44,12 +44,12 @@ public class BuildingBlocksApplTestCase {
jmsBroker.setUseJmx(false);
jmsBroker.addConnector("tcp://localhost:61619");
- node1 = SCANodeFactory.newInstance().createSCANode("tours-appl.composite",
- new SCAContribution("introducing-trips", "../introducing-trips/target/classes"),
- new SCAContribution("buildingblocks", "../buildingblocks/target/classes"));
+ node1 = NodeFactory.getInstance().createNode("tours-appl.composite",
+ new Contribution("introducing-trips", "../introducing-trips/target/classes"),
+ new Contribution("buildingblocks", "../buildingblocks/target/classes"));
- node2 = SCANodeFactory.newInstance().createSCANode("tours-appl-client.composite",
- new SCAContribution("buildingblocks-client", "./target/classes"));
+ node2 = NodeFactory.getInstance().createNode("tours-appl-client.composite",
+ new Contribution("buildingblocks-client", "./target/classes"));
jmsBroker.start();
node1.start();
@@ -58,7 +58,7 @@ public class BuildingBlocksApplTestCase {
@Test
public void testAppl() {
- Runnable client = ((SCAClient)node2).getService(Runnable.class, "ApplClient/Runnable");
+ Runnable client = ((Node)node2).getService(Runnable.class, "ApplClient/Runnable");
client.run();
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
index ad48db5616..ebc278f5b4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
@@ -19,10 +19,10 @@
package scatours;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -32,21 +32,21 @@ import org.junit.Test;
*/
public class BuildingBlocksImplIncludeTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
- node = SCANodeFactory.newInstance().createSCANode("tours-impl-include-client.composite",
- new SCAContribution("introducing-trips", "../introducing-trips/target/classes"),
- new SCAContribution("buildingblocks", "../buildingblocks/target/classes"),
- new SCAContribution("buildingblocks-client", "./target/classes"));
+ node = NodeFactory.getInstance().createNode("tours-impl-include-client.composite",
+ new Contribution("introducing-trips", "../introducing-trips/target/classes"),
+ new Contribution("buildingblocks", "../buildingblocks/target/classes"),
+ new Contribution("buildingblocks-client", "./target/classes"));
node.start();
}
@Test
public void testImplInclude() {
- Runnable client = ((SCAClient)node).getService(Runnable.class, "ToursClient/Runnable");
+ Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");
client.run();
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java
index c4cffa3e02..9356a2b146 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java
@@ -19,10 +19,10 @@
package scatours;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -32,20 +32,20 @@ import org.junit.Test;
*/
public class BuildingBlocksImplTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
- node = SCANodeFactory.newInstance().createSCANode("tours-impl-client.composite",
- new SCAContribution("buildingblocks", "../buildingblocks/target/classes"),
- new SCAContribution("buildingblocks-client", "./target/classes"));
+ node = NodeFactory.getInstance().createNode("tours-impl-client.composite",
+ new Contribution("buildingblocks", "../buildingblocks/target/classes"),
+ new Contribution("buildingblocks-client", "./target/classes"));
node.start();
}
@Test
public void testImpl() {
- Runnable client = ((SCAClient)node).getService(Runnable.class, "ToursClient/Runnable");
+ Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");
client.run();
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml
index 32985041a7..bf5ad5c51a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-buildingblocks</artifactId>
<name>Apache Tuscany SCA Tours Building Blocks Contribution</name>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
@@ -71,13 +71,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-node-runtime</artifactId>
- <version>${tuscany.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java
index 38ddc1f099..748e88ee09 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java
@@ -18,7 +18,7 @@
*/
package com.budgettours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Tours {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..5026d23c95 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java
@@ -18,7 +18,7 @@
*/
package com.goodvaluetrips;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Trips {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java
index 9d54d46bb6..4ddd145778 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Bookings {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java
index 29c84d2bc0..4e8f1481f5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java
@@ -20,7 +20,7 @@ package com.tuscanyscatours;
import java.math.BigDecimal;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Checkout {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java
index e33b0399cb..beb5f529b1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Updates {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
index f2884f87c5..1259fa7d82 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours.impl;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
import com.goodvaluetrips.Trips;
import com.tuscanyscatours.Bookings;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml
index 028c41e415..697b706163 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml
@@ -17,11 +17,11 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tst="http://tuscanyscatours.com/">
- <import namespace="http://goodvaluetrips.com/" />
- <export namespace="http://tuscanyscatours.com/" />
<deployable composite="tst:ToursAppl" />
<deployable composite="tst:ToursImpl" />
<deployable composite="tst:ToursImplInclude" />
+ <import namespace="http://goodvaluetrips.com/" />
+ <export namespace="http://tuscanyscatours.com/" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite
index 8733c79c5d..6d0a1c1f0d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:bb="http://bb.tuscanyscatours.com/"
xmlns:gvt="http://goodvaluetrips.com/"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite
index 4080523309..1441702a98 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:bb="http://bb.tuscanyscatours.com/"
xmlns:gvt="http://goodvaluetrips.com/"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite
index 1d82858f22..c1a7643df6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:bb="http://bb.tuscanyscatours.com/"
name="ToursImpl">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite
index b66d2344cd..d2d74d08fc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://bb.tuscanyscatours.com/"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
name="Tours">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
index ccdd2a73bd..6c9079e5ab 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
@@ -24,10 +24,10 @@ import java.math.BigDecimal;
import com.tuscanyscatours.Bookings;
import com.tuscanyscatours.Checkout;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -37,23 +37,23 @@ import org.junit.Test;
*/
public class BuildingBlocksImplIncludeTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
- node = SCANodeFactory.newInstance().createSCANode("tours-impl-include.composite",
- new SCAContribution("introducing-trips", "../introducing-trips/target/classes"),
- new SCAContribution("buildingblocks", "./target/classes"));
+ node = NodeFactory.getInstance().createNode("tours-impl-include.composite",
+ new Contribution("introducing-trips", "../introducing-trips/target/classes"),
+ new Contribution("buildingblocks", "./target/classes"));
node.start();
}
@Test
public void testImplInclude() {
- Bookings bookings = ((SCAClient)node).getService(Bookings.class, "MyTours/BookTrip");
+ Bookings bookings = ((Node)node).getService(Bookings.class, "MyTours/BookTrip");
String bookingCode = bookings.newBooking("FS1APR4", 1);
System.out.println("Booking code is " + bookingCode);
- Checkout checkout = ((SCAClient)node).getService(Checkout.class, "MyTours/Checkout");
+ Checkout checkout = ((Node)node).getService(Checkout.class, "MyTours/Checkout");
checkout.makePayment(new BigDecimal("1995.00"), "1234567801234567 11/10");
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java
index 35271bc5aa..f74304409d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java
@@ -24,10 +24,10 @@ import java.math.BigDecimal;
import com.tuscanyscatours.Bookings;
import com.tuscanyscatours.Checkout;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -37,22 +37,22 @@ import org.junit.Test;
*/
public class BuildingBlocksImplTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
- node = SCANodeFactory.newInstance().createSCANode("tours-impl.composite",
- new SCAContribution("buildingblocks", "./target/classes"));
+ node = NodeFactory.getInstance().createNode("tours-impl.composite",
+ new Contribution("buildingblocks", "./target/classes"));
node.start();
}
@Test
public void testImpl() {
- Bookings bookings = ((SCAClient)node).getService(Bookings.class, "MyTours/BookTrip");
+ Bookings bookings = ((Node)node).getService(Bookings.class, "MyTours/BookTrip");
String bookingCode = bookings.newBooking("FS1APR4", 1);
System.out.println("Booking code is " + bookingCode);
- Checkout checkout = ((SCAClient)node).getService(Checkout.class, "MyTours/Checkout");
+ Checkout checkout = ((Node)node).getService(Checkout.class, "MyTours/Checkout");
checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10");
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/pom.xml
index 489f26240c..b3926ca633 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-calendar</artifactId>
<name>Apache Tuscany SCA Tours Calendar Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml
index 86f28d7423..e37c61d48b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<export.java package="com.tuscanyscatours.calendar" />
<export.java package="com.tuscanyscatours.calendar.impl" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
index 8e0f003c4b..339c3ed41e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
@@ -18,10 +18,10 @@
*/
package scatours.calendar;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -33,20 +33,20 @@ import com.tuscanyscatours.calendar.Calendar;
*/
public class CalendarTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startNode() throws Exception {
node =
- SCANodeFactory.newInstance().createSCANode("calendar.composite",
- new SCAContribution("calendar", "./target/classes"),
- new SCAContribution("calendar-test", "./target/test-classes"));
+ NodeFactory.getInstance().createNode("calendar.composite",
+ new Contribution("calendar", "./target/classes"),
+ new Contribution("calendar-test", "./target/test-classes"));
node.start();
}
@Test
public void testCalendar() throws Exception {
- Calendar calendar = ((SCAClient)node).getService(Calendar.class, "Calendar");
+ Calendar calendar = ((Node)node).getService(Calendar.class, "Calendar");
System.out.println(calendar.getEndDate("07/10/96 04:05", 3));
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml
index e57bf783fc..87e99010b8 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.calendar" />
<import.java package="com.tuscanyscatours.calendar.impl" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite
index 076eed15b2..3ddb33db80 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="calendar">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml
index 30ce5d7bb1..e71040dc04 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-car</artifactId>
<name>Apache Tuscany SCA Tours Car Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
index f75c772d48..672afbc609 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
@@ -21,10 +21,10 @@ package com.tuscanyscatours.car.impl;
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.Book;
import com.tuscanyscatours.common.Search;
@@ -36,7 +36,7 @@ import com.tuscanyscatours.common.TripLeg;
* An implementation of the Car service
*/
@Scope("STATELESS")
-@Service(interfaces = {Search.class, Book.class})
+@Service({Search.class, Book.class})
public class CarImpl implements Search, Book {
private List<CarInfo> cars = new ArrayList<CarInfo>();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
index eb9ffba20d..67fcaf8c6c 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.common"/>
<export.java package="com.tuscanyscatours.car.impl"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml
index 48d83ceba8..2a8e684d5d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-common</artifactId>
<name>Apache Tuscany SCA Tours Common Artefacts Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java
index 47b6f50bec..797957250a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.common;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Book {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
index 1611c11792..f304141a06 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
@@ -19,10 +19,9 @@
package com.tuscanyscatours.common;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
@Callback(SearchCallback.class)
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
index ad13d0d352..2a527d0461 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.common;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface SearchCallback {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
index d7ada5afe7..cebda8d6d6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
@@ -17,6 +17,6 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<export.java package="com.tuscanyscatours.common" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/maven-eclipse.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/maven-eclipse.xml
index 4ceebd71f7..3adfca89f4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/maven-eclipse.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/maven-eclipse.xml
@@ -2,7 +2,7 @@
<target name="init"/>
<target name="copy-resources" depends="init">
<copy todir="target/classes/META-INF" filtering="true">
- <fileset dir="." includes="LICENSE|NOTICE"/>
+ <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/>
</copy>
</target>
</project> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml
index 207fab1320..9cf48a1c7d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-creditcard-payment-jaxb-policy</artifactId>
<name>Apache Tuscany SCA Tours Credit Card Payment Contribution JAXB Policy</name>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
index 293f08453f..f7723ab5b5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.payment.creditcard.impl;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml
index 3b889caefd..6348027529 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment.creditcard" />
<deployable composite="scatours:creditcard" />
+ <export.java package="com.tuscanyscatours.payment.creditcard" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/creditcard.composite
index 4a91a96255..77ecdef0df 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/creditcard.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/creditcard.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="creditcard">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml
index 5a2c58eaed..7824ec0d6a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://itest/policy"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:ip="http://itest/policy" >
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
index a33b2b3046..38834709b0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
@@ -19,10 +19,10 @@
package scatours.payment.creditcard;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -39,7 +39,7 @@ import com.tuscanyscatours.payment.creditcard.PayerType;
*
*/
public class CreditCardPaymentTestCase {
- private static SCANode node;
+ private static Node node;
/**
* @throws java.lang.Exception
@@ -48,7 +48,7 @@ public class CreditCardPaymentTestCase {
public static void setUpBeforeClass() throws Exception {
try {
node =
- SCANodeFactory.newInstance().createSCANode("creditcard.composite", new SCAContribution("creditcard", "./target/classes"));
+ NodeFactory.getInstance().createNode("creditcard.composite", new Contribution("creditcard", "./target/classes"));
node.start();
} catch (Exception ex) {
@@ -58,7 +58,7 @@ public class CreditCardPaymentTestCase {
@Test
public void testCreditCardPayment() {
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");
ObjectFactory objectFactory = new ObjectFactory();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml
index ee15aae264..db519eb5cd 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>
<name>Apache Tuscany SCA Tours Credit Card Payment Contribution JAXB</name>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
index ed817a58bb..13dc7428d1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.payment.creditcard.impl;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
index ea6bed8e09..f29ddff781 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment.creditcard" />
<deployable composite="scatours:creditcard" />
+ <export.java package="com.tuscanyscatours.payment.creditcard" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite
index db6907cf7e..1e07159fbc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite
@@ -17,17 +17,13 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://tuscanyscatours.com/"
- name="creditcard">
-
- <component name="CreditCardPayment">
- <implementation.java class="com.tuscanyscatours.payment.creditcard.impl.CreditCardPaymentImpl" />
- <service name="CreditCardPayment">
- <interface.wsdl interface="http://www.tuscanyscatours.com/CreditCardPayment/#wsdl.interface(CreditCardPayment)" />
- <binding.ws uri="http://localhost:8082/CreditCardPayment" />
- <binding.sca/>
- </service>
- </component>
-
-</composite>
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="creditcard" targetNamespace="http://tuscanyscatours.com/">
+ <component name="CreditCardPayment">
+ <implementation.java class="com.tuscanyscatours.payment.creditcard.impl.CreditCardPaymentImpl"/>
+ <service name="CreditCardPayment">
+ <interface.wsdl interface="http://www.tuscanyscatours.com/CreditCardPayment/#wsdl.interface(CreditCardPayment)"/>
+ <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
+ <binding.sca/>
+ </service>
+ </component>
+</composite> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
index 65c7beb367..ed3d33af21 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
@@ -19,10 +19,10 @@
package scatours.payment.creditcard;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -39,7 +39,7 @@ import com.tuscanyscatours.payment.creditcard.PayerType;
*
*/
public class CreditCardPaymentTestCase {
- private static SCANode node;
+ private static Node node;
/**
* @throws java.lang.Exception
@@ -48,7 +48,7 @@ public class CreditCardPaymentTestCase {
public static void setUpBeforeClass() throws Exception {
try {
node =
- SCANodeFactory.newInstance().createSCANode(null, new SCAContribution("creditcard", "./target/classes"));
+ NodeFactory.getInstance().createNode(new Contribution("creditcard", "./target/classes"));
node.start();
} catch (Exception ex) {
@@ -58,7 +58,7 @@ public class CreditCardPaymentTestCase {
@Test
public void testCreditCardPayment() {
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");
ObjectFactory objectFactory = new ObjectFactory();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml
index 56eafd7c07..082d3e0fe5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-creditcard-payment-sdo</artifactId>
<name>Apache Tuscany SCA Tours Credit Card Payment Contribution SDO</name>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
index ed817a58bb..13dc7428d1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.payment.creditcard.impl;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml
index ab31664247..34f5ec3d0e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tours="http://tuscanyscatours.com/">
<deployable composite="tours:creditcard" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite
index f5cd7c2506..392af83d2e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="creditcard">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
index b7d76a061f..b2ffc3fc4d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
@@ -19,10 +19,10 @@
package scatours.payment.creditcard;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -36,21 +36,21 @@ import com.tuscanyscatours.payment.creditcard.PayerType;
*
*/
public class CreditCardPaymentTestCase {
- private static SCANode node;
+ private static Node node;
/**
* @throws java.lang.Exception
*/
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANode(null, new SCAContribution("creditcard-sdo", "./target/classes"));
+ NodeFactory factory = NodeFactory.getInstance();
+ node = factory.createNode(new Contribution("creditcard-sdo", "./target/classes"));
node.start();
}
@Test
public void testCreditCardPayment() {
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");
CreditCardPaymentFactory factory = CreditCardPaymentFactory.INSTANCE;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
index 46ed51704b..60df41705a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-creditcard-payment-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Tours CreditCard Payment WebApp Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 898321c510..a0bfe2c713 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
<deployable composite="scatours:creditcard-webapp" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-deployables/web.composite
index ac9128a6d5..cf146e4f5b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-deployables/web.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="creditcard-webapp">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml
index 8ab8cff332..dbcacc4d7f 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-currency-corba</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter Contribution With CORBA Binding</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml
index f22dd9b55d..6a067411f1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.currencyconverter"/>
<import.java package="com.tuscanyscatours.currencyconverter.impl"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite
index 3fde6ea309..492689290a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
name="currencyconverter">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml
index ef1aa9fd3a..1b63b608fc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-currency-jms</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter Contribution With JMS Binding</name>
@@ -50,12 +50,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jms-asf</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
index 89ba1a3578..0eea8a6b52 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.currencyconverter" />
<import.java package="com.tuscanyscatours.currencyconverter.impl" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
index ac34d6f562..cc73ceb3ef 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="currencyconverter">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml
index 5942d4f911..3aa04a0b7d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-currency-jsp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Tours Currency Converter JSP Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
index 50667b1ac0..cbd39d03d2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
name="CurrencyConverterJSP">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml
index 0bd15a7895..7c3f88c18f 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-currency-rmi</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter Contribution With RMI Binding</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
index cf7325d247..e335c8d4f3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.currencyconverter" />
<import.java package="com.tuscanyscatours.currencyconverter.impl" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
index 52df3a183f..07dea033c2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
name="currencyconverter">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml
index cc4ba525a1..bce29ad874 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-currency-servlet</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Tours Currency Converter Servlet Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java
index 3584ebbb93..465c667f0b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.annotation.Reference;
import com.tuscanyscatours.currencyconverter.CurrencyConverter;
@@ -43,7 +43,7 @@ public class CurrencyConverterServlet extends HttpServlet {
// annotation in containers supporting SCA "deep" integration. In other
// environments in can be looked up from the ComponentContext.
ComponentContext context =
- (ComponentContext)config.getServletContext().getAttribute("org.osoa.sca.ComponentContext");
+ (ComponentContext)config.getServletContext().getAttribute("org.oasisopen.sca.ComponentContext");
currencyConverter = context.getService(CurrencyConverter.class, "currencyConverter");
}
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
index c9ef16ee1b..ce73eb15aa 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://scatours.com"
name="CurrencyConverterServlet">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml
index 5d309faa85..5286b36170 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-currency-ws</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter Contribution With Web Service Binding</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml
index cf7325d247..e335c8d4f3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.currencyconverter" />
<import.java package="com.tuscanyscatours.currencyconverter.impl" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
index b048a826f1..a1be5f52c3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="currencyconverter">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml
index 0b35063efa..fa9a7a4f34 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-currency</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
index b1f783bfba..3ebd23b2d0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
index 6ad9a957c7..ee81973986 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
@@ -21,14 +21,14 @@ package com.tuscanyscatours.currencyconverter.impl;
import java.util.HashMap;
import java.util.Map;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.currencyconverter.CurrencyConverter;
/**
* An implementation of the CurrencyConverter service
*/
-@Service(interfaces = {CurrencyConverter.class})
+@Service({CurrencyConverter.class})
public class CurrencyConverterImpl implements CurrencyConverter {
// currency index
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
index b11328f405..cfd2a68821 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<export.java package="com.tuscanyscatours.currencyconverter" />
<export.java package="com.tuscanyscatours.currencyconverter.impl" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite
index 41d0d325d4..edfa249cb9 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="currencyconverter">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/pom.xml
index 1ceea2b45d..b64ebb984f 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-databinding-client</artifactId>
<name>Apache Tuscany SCA Tours Databinding Client Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/java/scatours/client/TestClient.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/java/scatours/client/TestClient.java
index f598a6f056..cf5b20f902 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/java/scatours/client/TestClient.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/java/scatours/client/TestClient.java
@@ -19,8 +19,8 @@
package scatours.client;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.Payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml
index 87e8535676..1df20c6ecd 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:client="http://client.scatours/">
- <import.java package="com.tuscanyscatours.payment" />
<deployable composite="client:Client" />
+ <import.java package="com.tuscanyscatours.payment" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/client.composite
index e19697290c..bb5a4952c4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://client.scatours/"
name="Client">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml
index 3f0ade6681..d2a4b6777a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-emailgateway</artifactId>
<name>Apache Tuscany SCA Tours Email Gateway Contribution</name>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
index 0ff12b4efa..1371811619 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.emailgateway.impl;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.emailgateway.EmailGateway;
import com.tuscanyscatours.emailgateway.EmailType;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml
index 7d8aa000cc..2bb1f7f6d1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:e="http://emailgateway" >
+ <deployable composite="e:emailgateway" />
<export.java package="com.tuscanyscatours.emailgateway" />
<export.java package="com.tuscanyscatours.emailgateway.impl" />
- <deployable composite="e:emailgateway" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
index a401b2a96e..3e5ff5cd49 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:e="http://emailgateway"
targetNamespace="http://emailgateway"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
index 8b0ecba024..e6afc6c62f 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
@@ -19,10 +19,10 @@
package scatours.emailgateway;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -35,24 +35,24 @@ import com.tuscanyscatours.emailgateway.ObjectFactory;
*
*/
public class EmailGatewayTestCase {
- private static SCANode node;
+ private static Node node;
/**
* @throws java.lang.Exception
*/
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- SCANodeFactory factory = SCANodeFactory.newInstance();
+ NodeFactory factory = NodeFactory.getInstance();
node =
- factory.createSCANode(null,
- new SCAContribution("emailgateway", "./target/classes"),
- new SCAContribution("emailgateway-test", "./target/test-classes"));
+ factory.createNode(
+ new Contribution("emailgateway", "./target/classes"),
+ new Contribution("emailgateway-test", "./target/test-classes"));
node.start();
}
@Test
public void testEmailGateway() {
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
EmailGateway cc = client.getService(EmailGateway.class, "EmailGatewayClient");
ObjectFactory objectFactory = new ObjectFactory();
EmailType email = objectFactory.createEmailType();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java
index 10d4984665..7b21cdecf3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java
@@ -19,8 +19,8 @@
package scatours.emailgateway.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.emailgateway.EmailGateway;
import com.tuscanyscatours.emailgateway.EmailType;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
index cc141d7703..ee15d8e5ed 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:e="http://emailgateway-test">
+ <deployable composite="e:emailgateway-test" />
<import.java package="com.tuscanyscatours.emailgateway" />
<import.java package="com.tuscanyscatours.emailgateway.impl" />
- <deployable composite="e:emailgateway-test" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
index 8305356bda..441af67a42 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:e="http://emailgateway-test"
targetNamespace="http://emailgateway-test"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml
index 71c287d873..f2509823bd 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-feed-logger</artifactId>
<name>Apache Tuscany SCA Tours Feed Logger Contribution</name>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
</dependency>
@@ -56,13 +56,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-atom-abdera</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rss-rome</artifactId>
+ <artifactId>tuscany-binding-atom-runtime</artifactId>
<version>${tuscany.version}</version>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java
index a949d63383..daab1be2b4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
import com.sun.syndication.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndFeed;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
index 556807a0f0..dd76faefad 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
@@ -17,5 +17,5 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
index 17c24adefb..f285308611 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
name="feedLogger">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/pom.xml
index 07659add09..9ece98565f 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-flight</artifactId>
<name>Apache Tuscany SCA Tours Flight Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightImpl.java
index 36407de5b3..82caab00e3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightImpl.java
@@ -21,11 +21,11 @@ package com.tuscanyscatours.flight.impl;
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ComponentName;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.ComponentName;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.Book;
import com.tuscanyscatours.common.Search;
@@ -37,7 +37,7 @@ import com.tuscanyscatours.common.TripLeg;
* An implementation of the Flight service
*/
@Scope("CONVERSATION")
-@Service(interfaces = {Search.class, Book.class})
+@Service({Search.class, Book.class})
public class FlightImpl implements Search, Book {
private List<FlightInfo> flights = new ArrayList<FlightInfo>();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml
index 1e539bf13b..2d4964501a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.common"/>
<export.java package="com.tuscanyscatours.flight.impl"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml
index 19057cd8ca..bf4bbfca77 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>
<name>Apache Tuscany SCA Tours Full Application Bespoke Contribution</name>
@@ -44,14 +44,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
index 9ae204d8f7..4de92453fe 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
<deployable composite="scatours:fullapp-bespoketrip" />
<import.java package="com.tuscanyscatours.common" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
index 76c91b7887..2816963336 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
name="fullapp-bespoketrip">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml
index 3d802afef3..a752d4e102 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-fullapp-coordination</artifactId>
<name>Apache Tuscany SCA Tours Full Application Coordination Contribution</name>
@@ -44,14 +44,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
index a6eb8bcce2..f7973ba37a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
<deployable composite="scatours:fullapp-coordination" />
<import.java package="com.tuscanyscatours.common" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
index b3c901085d..ee8978a615 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="fullapp-coordination">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml
index 3d80feca3b..a21140d871 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-fullapp-currency</artifactId>
<name>Apache Tuscany SCA Tours Full Application Currency Contribution</name>
@@ -44,14 +44,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
index dc66ed8db6..98673ded6e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
<deployable composite="scatours:fullapp-currency" />
<import.java package="com.tuscanyscatours.currencyconverter" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
index 654ff60c41..3bbcfca7d9 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="fullapp-currency">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml
index da1619db56..184814d0fb 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-fullapp-packagedtrip</artifactId>
<name>Apache Tuscany SCA Tours Full Application Packaged Trip Contribution</name>
@@ -44,14 +44,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
index 3059c49911..7ec170f9cb 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
<deployable composite="scatours:fullapp-packagedtrip" />
<import.java package="com.tuscanyscatours.common" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
index 0f8dd33060..83fb30b3a3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
name="fullapp-packagedtrip">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml
index 4be01a61e2..d56ced5852 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-fullapp-shoppingcart</artifactId>
<name>Apache Tuscany SCA Tours Full Application Shopping Cart Contribution</name>
@@ -44,14 +44,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
index 384887f792..1c1fe43b53 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
<deployable composite="scatours:fullapp-shoppingcart" />
<import.java package="com.tuscanyscatours.payment" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
index ed4fce84d6..1d6a5d60b6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="fullapp-shoppingcart">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml
index 36fdea630f..7320851863 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-fullapp-ui</artifactId>
<name>Apache Tuscany SCA Tours Full Application User Interface Contribution</name>
@@ -44,14 +44,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>test</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
index 104a78cd92..96ff425edb 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
<deployable composite="scatours:fullapp-ui" />
<import.java package="com.tuscanyscatours" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
index bcfa894ca6..cbce322858 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
name="fullapp-ui">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml
index cf8985ffe7..92dda106b6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-help-pages</artifactId>
<name>Apache Tuscany SCA Tours Help Pages Contribution</name>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/META-INF/sca-contribution.xml
index 038f9260b4..2b875a4906 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/META-INF/sca-contribution.xml
@@ -17,6 +17,6 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<export.resource uri="help_pages"/>
</contribution> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help-pages.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help-pages.composite
index 1ef8c0a6b1..067fe31370 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help-pages.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help-pages.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://www.tuscanyscatours.com/"
name="helpPages">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml
index edba61164c..d023268437 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-hotel</artifactId>
<name>Apache Tuscany SCA Tours Hotel Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/impl/HotelImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/impl/HotelImpl.java
index fe8953ea0e..c56b5ad1d3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/impl/HotelImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/impl/HotelImpl.java
@@ -21,10 +21,10 @@ package com.tuscanyscatours.hotel.impl;
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.Book;
import com.tuscanyscatours.common.Search;
@@ -38,7 +38,7 @@ import com.tuscanyscatours.hotel.HotelManagement;
* An implementation of the Hotel service
*/
@Scope("STATELESS")
-@Service(interfaces = {Search.class, Book.class, HotelManagement.class})
+@Service({Search.class, Book.class, HotelManagement.class})
public class HotelImpl implements Search, Book, HotelManagement {
private List<HotelInfo> hotels = new ArrayList<HotelInfo>();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml
index 40382221a5..4dac3ec671 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.common"/>
<export.java package="com.tuscanyscatours.hotel"/>
<export.java package="com.tuscanyscatours.hotel.impl"/>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml
index 3005f3512c..fd34f4cf36 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-interaction-client</artifactId>
<name>Apache Tuscany SCA Tours Interaction Client Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java
index 290e6e6aee..7ad0d15442 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java
@@ -19,9 +19,9 @@
package scatours.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.TripItem;
import com.tuscanyscatours.shoppingcart.CartStore;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.java
index ca3cb2874a..c12c709461 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.java
@@ -19,8 +19,8 @@
package scatours.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.calendar.Calendar;
import com.tuscanyscatours.common.TripLeg;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java
index 9689ce8e0c..0b52d2d516 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java
@@ -21,9 +21,9 @@ package scatours.client.impl;
import java.util.concurrent.CountDownLatch;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.Search;
import com.tuscanyscatours.common.SearchCallback;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java
index 1fd9d9cbe8..0026b2e0b7 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java
@@ -19,8 +19,8 @@
package scatours.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.Search;
import com.tuscanyscatours.common.SearchCallback;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java
index d1438434ae..f25a069713 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java
@@ -19,8 +19,8 @@
package scatours.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.currencyconverter.CurrencyConverter;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml
index 283a1588df..24349299a4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tours="http://tucsanyscatours.com/">
+ <deployable composite="tours:client" />
<import.java package="com.tuscanyscatours.calendar" />
<import.java package="com.tuscanyscatours.calendar.impl" />
<import.java package="com.tuscanyscatours.common" />
@@ -26,5 +27,4 @@
<import.java package="com.tuscanyscatours.currencyconverter.impl" />
<import.java package="com.tuscanyscatours.shoppingcart" />
<import.java package="com.tuscanyscatours.shoppingcart.impl" />
- <deployable composite="tours:client" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite
index 1c8552974b..5fc2006cf0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="Client">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml
index 42febd7986..0b0ffd41c3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-interaction-service-remote</artifactId>
<name>Apache Tuscany SCA Tours Interaction Service Remote Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml
index c26d63563b..bcd545afe3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml
@@ -17,10 +17,10 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tours="http://com.tuscanyscatours/">
+ <deployable composite="tours:service" />
<import.java package="com.tuscanyscatours.common" />
<import.java package="com.tuscanyscatours.flight.impl" />
<import.java package="com.tuscanyscatours.hotel.impl" />
- <deployable composite="tours:service" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite
index 0f368da1ed..4f070ea934 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="Service">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml
index 6abf8cd0c0..b163304934 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-introducing-client</artifactId>
<name>Apache Tuscany SCA Tours Introducing Client Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java
index f81a2c7304..c89eec07fe 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java
@@ -21,8 +21,8 @@ package scatours.client.impl;
import java.math.BigDecimal;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.Bookings;
import com.tuscanyscatours.Checkout;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/META-INF/sca-contribution.xml
index 9ce11f16ef..7548d3d99e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:client="http://client.scatours/">
- <import.java package="com.tuscanyscatours" />
<deployable composite="client:Client" />
+ <import.java package="com.tuscanyscatours" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/client.composite
index 3a404eb10d..fbefc7b35b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://client.scatours/"
name="Client">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/pom.xml
index 90839f94d4..ba0c405364 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-introducing-tours</artifactId>
<name>Apache Tuscany SCA Tours Introducing Tours Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..5026d23c95 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/goodvaluetrips/Trips.java
@@ -18,7 +18,7 @@
*/
package com.goodvaluetrips;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Trips {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Bookings.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Bookings.java
index 9d54d46bb6..4ddd145778 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Bookings.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Bookings.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Bookings {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Checkout.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Checkout.java
index 29c84d2bc0..4e8f1481f5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Checkout.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Checkout.java
@@ -20,7 +20,7 @@ package com.tuscanyscatours;
import java.math.BigDecimal;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Checkout {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Updates.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Updates.java
index e33b0399cb..beb5f529b1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Updates.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Updates.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Updates {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
index f2884f87c5..1259fa7d82 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours.impl;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
import com.goodvaluetrips.Trips;
import com.tuscanyscatours.Bookings;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/META-INF/sca-contribution.xml
index 5f76588dad..f2f0a85f00 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tst="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours" />
<deployable composite="tst:Tours" />
+ <export.java package="com.tuscanyscatours" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/tours.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/tours.composite
index 6d47793aa4..b468b9c053 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/tours.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/tours.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="Tours">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/pom.xml
index d586861b6b..9d601ab670 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-introducing-trips</artifactId>
<name>Apache Tuscany SCA Tours Introducing Trips Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..5026d23c95 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/Trips.java
@@ -18,7 +18,7 @@
*/
package com.goodvaluetrips;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Trips {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/META-INF/sca-contribution.xml
index 85e064b1a2..12ac4d4327 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:gvt="http://goodvaluetrips.com/">
- <export namespace="http://goodvaluetrips.com/" />
<deployable composite="gvt:Trips" />
+ <export namespace="http://goodvaluetrips.com/" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/trips.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/trips.composite
index 8d1db35b1f..28c6f0c4a0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/trips.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/trips.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://goodvaluetrips.com/"
name="Trips">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml
index 97270535fc..99a5deaa79 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-notification-corba</artifactId>
<name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway CORBA Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml
index 373d1494f6..68b39b735a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.notification" />
<import.java package="com.tuscanyscatours.notification.impl" />
<import.java package="com.tuscanyscatours.smsgateway" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/notification-corba.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/notification-corba.composite
index 8baca02509..f608e9c912 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/notification-corba.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/notification-corba.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
name="notification">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml
index 4838978d1c..7eb553d975 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-notification-ejb</artifactId>
<name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway EJB Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml
index 373d1494f6..68b39b735a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.notification" />
<import.java package="com.tuscanyscatours.notification.impl" />
<import.java package="com.tuscanyscatours.smsgateway" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite
index 11b632fd79..333eeb2d97 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="notification">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml
index 51c70da9b0..5a34e41dc5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-notification-jms</artifactId>
<name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway JMS Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml
index 373d1494f6..68b39b735a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.notification" />
<import.java package="com.tuscanyscatours.notification.impl" />
<import.java package="com.tuscanyscatours.smsgateway" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite
index dfd96ae918..9b965ca8b8 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="notification">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml
index 2d9761ad29..fb427a243b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-notification-rmi</artifactId>
<name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway RMI Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml
index 373d1494f6..68b39b735a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.notification" />
<import.java package="com.tuscanyscatours.notification.impl" />
<import.java package="com.tuscanyscatours.smsgateway" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite
index e80c381b55..a736a74ce0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscanyscatours.com/"
name="notification">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml
index 6d4bf325d3..0e7fd6c692 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-notification-ws</artifactId>
<name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway Web Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/META-INF/sca-contribution.xml
index 373d1494f6..68b39b735a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.notification" />
<import.java package="com.tuscanyscatours.notification.impl" />
<import.java package="com.tuscanyscatours.smsgateway" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite
index e2051ad612..6e3fba0a75 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="notification">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/pom.xml
index e8d93e1697..b48e92150e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-notification</artifactId>
<name>Apache Tuscany SCA Tours Notification Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java
index 58d590242d..cdd61f901b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java
@@ -19,8 +19,8 @@
package com.tuscanyscatours.notification.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.notification.Notification;
import com.tuscanyscatours.smsgateway.SMSGateway;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
index fdf5872565..7699868da5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.smsgateway;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* A gateway to send SMS messages.
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml
index 518c7e363b..3442da25d5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<export.java package="com.tuscanyscatours.notification" />
<export.java package="com.tuscanyscatours.notification.impl" />
<export.java package="com.tuscanyscatours.smsgateway" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml
index 4bd900239c..4b3b63aa9d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-payment-bpel-process</artifactId>
<name>Apache Tuscany SCA Tours Payment BPEL Process Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml
index f32584eee1..9ce3ed273c 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml
@@ -17,6 +17,6 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<export namespace="http://www.tuscanyscatours.com/Payment"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
index 3cf859b5eb..d520b6650c 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-payment-bpel</artifactId>
<name>Apache Tuscany SCA Tours Payment BPEL Contribution</name>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
index e95a8bf0a3..10d81a42e2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:pp="http://www.tuscanyscatours.com/Payment">
- <import namespace="http://www.tuscanyscatours.com/Payment"/>
<deployable composite="pp:payment"/>
+ <import namespace="http://www.tuscanyscatours.com/Payment"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite
index 5c337799a7..d4e3fe5fb2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:pp="http://www.tuscanyscatours.com/Payment"
targetNamespace="http://www.tuscanyscatours.com/Payment"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
index b38f2a9e9c..59fc9ef68c 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
@@ -19,10 +19,10 @@
package scatours.payment;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,42 +33,42 @@ import com.tuscanyscatours.payment.Payment;
*
*/
public class PaymentTestCase {
- private static SCANode paymentNode;
- private static SCANode creditCardNode;
- private static SCANode emailGatewayNode;
+ private static Node paymentNode;
+ private static Node creditCardNode;
+ private static Node emailGatewayNode;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
creditCardNode =
- SCANodeFactory.newInstance()
- .createSCANode("creditcard.composite",
- new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
+ NodeFactory.getInstance()
+ .createNode("creditcard.composite",
+ new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
creditCardNode.start();
emailGatewayNode =
- SCANodeFactory.newInstance().createSCANode("emailgateway.composite",
- new SCAContribution("emailgateway",
+ NodeFactory.getInstance().createNode("emailgateway.composite",
+ new Contribution("emailgateway",
"../emailgateway/target/classes"),
- new SCAContribution("emailgateway-test",
+ new Contribution("emailgateway-test",
"../emailgateway/target/test-classes"));
emailGatewayNode.start();
paymentNode =
- SCANodeFactory.newInstance()
- .createSCANode(null,
- new SCAContribution("payment-bpel-process",
+ NodeFactory.getInstance()
+ .createNode(
+ new Contribution("payment-bpel-process",
"../payment-bpel-process/target/classes"),
- new SCAContribution("payment-bpel", "./target/classes"),
- new SCAContribution("payment-bpel-test", "./target/test-classes"));
+ new Contribution("payment-bpel", "./target/classes"),
+ new Contribution("payment-bpel-test", "./target/test-classes"));
paymentNode.start();
}
@Test
public void testPayment() {
- SCAClient client = (SCAClient)paymentNode;
+ Node client = (Node)paymentNode;
Payment payment = client.getService(Payment.class, "PaymentClient");
System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
index a38ba51ac5..3b8d8ad88a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
@@ -19,8 +19,8 @@
package scatours.payment.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.Payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml
index fcfc2d7c61..7112bd3820 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:pp="http://www.tuscanyscatours.com/Payment">
- <import.java package="com.tuscanyscatours.payment" />
<deployable composite="pp:paymentClient" />
+ <import.java package="com.tuscanyscatours.payment" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite
index a5110aacff..847c0cab6e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:pp="http://www.tuscanyscatours.com/Payment"
targetNamespace="http://www.tuscanyscatours.com/Payment"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
index bd33f12b75..40a16070b2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-payment-groovy</artifactId>
<name>Apache Tuscany SCA Tours Payment Groovy Contribution</name>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
index 36e2990be1..63b79a7f63 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment" />
<deployable composite="tours:payment" />
+ <export.java package="com.tuscanyscatours.payment" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite
index 071c6786d1..d0aef3188c 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
index 907bcc93f8..440fbd9721 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
@@ -19,10 +19,10 @@
package scatours.payment;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -34,32 +34,32 @@ import com.tuscanyscatours.payment.Payment;
*/
public class PaymentTestCase {
- private static SCANode paymentNode;
- private static SCANode creditCardNode;
- private static SCANode emailGatewayNode;
+ private static Node paymentNode;
+ private static Node creditCardNode;
+ private static Node emailGatewayNode;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
creditCardNode =
- SCANodeFactory.newInstance()
- .createSCANode("creditcard.composite",
- new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
+ NodeFactory.getInstance()
+ .createNode("creditcard.composite",
+ new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
creditCardNode.start();
emailGatewayNode =
- SCANodeFactory.newInstance().createSCANode("emailgateway.composite",
- new SCAContribution("emailgateway",
+ NodeFactory.getInstance().createNode("emailgateway.composite",
+ new Contribution("emailgateway",
"../emailgateway/target/classes"),
- new SCAContribution("emailgateway-test",
+ new Contribution("emailgateway-test",
"../emailgateway/target/test-classes"));
emailGatewayNode.start();
paymentNode =
- SCANodeFactory.newInstance().createSCANode(null,
- new SCAContribution("payment-groovy", "./target/classes"),
- new SCAContribution("payment-groovy-test",
+ NodeFactory.getInstance().createNode(
+ new Contribution("payment-groovy", "./target/classes"),
+ new Contribution("payment-groovy-test",
"./target/test-classes"));
paymentNode.start();
@@ -67,7 +67,7 @@ public class PaymentTestCase {
@Test
public void testPayment() {
- SCAClient client = (SCAClient)paymentNode;
+ Node client = (Node)paymentNode;
Payment payment = client.getService(Payment.class, "PaymentClient");
System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
index a38ba51ac5..3b8d8ad88a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
@@ -19,8 +19,8 @@
package scatours.payment.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.Payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
index 378e09009b..666769fef5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tours="http://tuscanyscatours.com/" >
<deployable composite="tours:paymentClient" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite
index 353c1cea04..93482dfb45 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="paymentClient">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml
index 4ceebd71f7..3adfca89f4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml
@@ -2,7 +2,7 @@
<target name="init"/>
<target name="copy-resources" depends="init">
<copy todir="target/classes/META-INF" filtering="true">
- <fileset dir="." includes="LICENSE|NOTICE"/>
+ <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/>
</copy>
</target>
</project> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml
index e4d416fee2..b04b40b6a0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-payment-java-policy</artifactId>
<name>Apache Tuscany SCA Tours Payment Java Policy Contribution</name>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
index 26926c7764..d0b1736e98 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
@@ -23,12 +23,12 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Requires;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
@@ -44,7 +44,7 @@ import com.tuscanyscatours.payment.creditcard.PayerType;
@Service(CustomerRegistry.class)
@Scope("COMPOSITE")
@EagerInit
-@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")
+@Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global")
public class CustomerRegistryImpl implements CustomerRegistry {
private volatile static int idGenerator = 0;
private Map<String, Customer> customers = new HashMap<String, Customer>();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
index 0fbf63d6bc..716ea18ee4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.emailgateway;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* A gateway to send e-mail
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
index d9798e436a..3556b4855b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.emailgateway.impl;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.emailgateway.EmailGateway;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
index b3eb95b44b..e25505ce45 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
@@ -19,10 +19,10 @@
package com.tuscanyscatours.payment.impl;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Requires;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
@@ -45,7 +45,7 @@ public class PaymentImpl implements Payment {
@Reference
//@Authentication - not supported
- @Requires("{http://www.osoa.org/xmlns/sca/1.0}authentication")
+ @Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}authentication")
protected CreditCardPayment creditCardPayment;
@Reference
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml
index 0fd7cb9910..abe5ba8718 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment" />
<deployable composite="scatours:payment" />
+ <export.java package="com.tuscanyscatours.payment" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml
index edaa250b10..1cd5ebb59e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
<!-- Policy Intents Defined by the SCA Runtime -->
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite
index 710583ae5d..8050d19771 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="payment">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
index d8c79622e6..6ebcc4f2dc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
@@ -19,10 +19,10 @@
package scatours.payment;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -31,19 +31,19 @@ import org.junit.Test;
import com.tuscanyscatours.payment.Payment;
public class PaymentTestCase {
- private static SCANode node1;
- private static SCANode node2;
+ private static Node node1;
+ private static Node node2;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
node1 =
- SCANodeFactory.newInstance()
- .createSCANode("payment.composite",
- new SCAContribution("payment", "./target/classes"));
+ NodeFactory.getInstance()
+ .createNode("payment.composite",
+ new Contribution("payment", "./target/classes"));
node2 =
- SCANodeFactory.newInstance()
- .createSCANode("creditcard.composite",
- new SCAContribution("creditcard",
+ NodeFactory.getInstance()
+ .createNode("creditcard.composite",
+ new Contribution("creditcard",
"../../contributions/creditcard-payment-jaxb/target/classes"));
node1.start();
node2.start();
@@ -51,7 +51,7 @@ public class PaymentTestCase {
@Test
public void testPayment() {
- SCAClient client = (SCAClient)node1;
+ Node client = (Node)node1;
Payment payment = client.getService(Payment.class, "Payment");
System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml
index a8a873e132..f8c27ca09b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-payment-java</artifactId>
<name>Apache Tuscany SCA Tours Payment Java Contribution</name>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
index bc76f411f3..906e392459 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
@@ -23,12 +23,12 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Requires;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
@@ -44,7 +44,7 @@ import com.tuscanyscatours.payment.creditcard.PayerType;
@Service(CustomerRegistry.class)
@Scope("COMPOSITE")
@EagerInit
-@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")
+@Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global")
public class CustomerRegistryImpl implements CustomerRegistry {
private volatile static int idGenerator = 0;
private Map<String, Customer> customers = new HashMap<String, Customer>();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
index 8c6ca806d2..d4aa8125e7 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.emailgateway;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* A gateway to send e-mail
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
index a6a162d5c3..1ae87d00cc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.emailgateway.impl;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.emailgateway.EmailGateway;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
index 988605f7cd..f384a9ac2a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
@@ -19,9 +19,9 @@
package com.tuscanyscatours.payment.impl;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml
index f8ff7b4623..52b8928c7e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment" />
<deployable composite="scatours:payment" />
+ <export.java package="com.tuscanyscatours.payment" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml
index dc47395e9b..a5f3379087 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<!-- Policy Intents Defined by the SCA Runtime -->
<intent name="authorization" constrains="sca:implementation"/>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite
index b4dcd328b1..b90c94b845 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="payment">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java
index ead8b87db0..b5345d6be8 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java
@@ -19,10 +19,10 @@
package scatours.payment;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -31,22 +31,22 @@ import org.junit.Test;
import com.tuscanyscatours.payment.Payment;
public class PaymentTestCase {
- private static SCANode node;
+ private static Node node;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
node =
- SCANodeFactory.newInstance()
- .createSCANode(null,
- new SCAContribution("payment", "./target/classes"),
- new SCAContribution("creditcard",
+ NodeFactory.getInstance()
+ .createNode(
+ new Contribution("payment", "./target/classes"),
+ new Contribution("creditcard",
"../../contributions/creditcard-payment-jaxb/target/classes"));
node.start();
}
@Test
public void testPayment() {
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
Payment payment = client.getService(Payment.class, "Payment");
System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml
index ff241a81b8..4622ddc8a4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-payment-spring-policy</artifactId>
<name>Apache Tuscany SCA Tours Payment Spring Policy Contribution</name>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
index 4381029543..147526dfd3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
@@ -23,11 +23,11 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml
index 696bf293f3..41677f6601 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:payment" />
+ <export.java package="com.tuscanyscatours.payment"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml
index 0e421d3b83..df29ffc1b7 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
<!-- Policy Sets -->
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
index 3f5bcfe48d..5ee7ef73b0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="payment">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java
index 0bff419ccd..1c03ef1572 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java
@@ -19,10 +19,10 @@
package scatours.payment;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,30 +33,30 @@ import com.tuscanyscatours.payment.Payment;
*
*/
public class PaymentTestCase {
- private static SCANode paymentNode;
- private static SCANode creditCardNode;
+ private static Node paymentNode;
+ private static Node creditCardNode;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
creditCardNode =
- SCANodeFactory.newInstance()
- .createSCANode("creditcard.composite",
- new SCAContribution("creditcard", "../creditcard-payment-jaxb-policy/target/classes"));
+ NodeFactory.getInstance()
+ .createNode("creditcard.composite",
+ new Contribution("creditcard", "../creditcard-payment-jaxb-policy/target/classes"));
creditCardNode.start();
paymentNode =
- SCANodeFactory.newInstance()
- .createSCANode(null,
- new SCAContribution("payment-spring-policy", "./target/classes"),
- new SCAContribution("payment-spring-policy-test", "./target/test-classes"));
+ NodeFactory.getInstance()
+ .createNode(
+ new Contribution("payment-spring-policy", "./target/classes"),
+ new Contribution("payment-spring-policy-test", "./target/test-classes"));
paymentNode.start();
}
@Test
public void testPayment() {
- SCAClient client = (SCAClient)paymentNode;
+ Node client = (Node)paymentNode;
Payment payment = client.getService(Payment.class, "PaymentClient");
System.out.println("Result = " + payment.makePaymentMember("c-0", 100.00f));
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
index 4f64b20c4e..3fee35a1db 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
@@ -19,8 +19,8 @@
package scatours.payment.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.Payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml
index c97b6862f4..969a5286cc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
- <import.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:paymentClient" />
+ <import.java package="com.tuscanyscatours.payment"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite
index 642cebfd1c..b442a46101 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="paymentClient">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml
index d5cd4905a1..05e800f762 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-payment-spring-scatag</artifactId>
<name>Apache Tuscany SCA Tours Payment Spring SCA Tag Contribution</name>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
index b480cc4aa1..976e2fc0b6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:payment" />
+ <export.java package="com.tuscanyscatours.payment"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
index 83776cde1b..d2f757c8ca 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
@@ -21,7 +21,7 @@
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.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+ http://www.springframework.org/schema/sca http://docs.oasis-open.org/ns/opencsa/sca/200912/spring-sca.xsd">
<sca:service name="Payment"
type="com.tuscanyscatours.payment.Payment"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
index 639f1e5662..7b923e397e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="payment">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
index 29fda50ef3..f2a4ecbcb6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
@@ -19,10 +19,10 @@
package scatours.payment;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,23 +33,23 @@ import com.tuscanyscatours.payment.Payment;
*
*/
public class PaymentTestCase {
- private static SCANode paymentNode;
- private static SCANode creditCardNode;
+ private static Node paymentNode;
+ private static Node creditCardNode;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
creditCardNode =
- SCANodeFactory.newInstance()
- .createSCANode("creditcard.composite",
- new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
+ NodeFactory.getInstance()
+ .createNode("creditcard.composite",
+ new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
creditCardNode.start();
paymentNode =
- SCANodeFactory.newInstance().createSCANode(null,
- new SCAContribution("payment-spring-annotation",
+ NodeFactory.getInstance().createNode(
+ new Contribution("payment-spring-annotation",
"./target/classes"),
- new SCAContribution("payment-spring-annotation-test",
+ new Contribution("payment-spring-annotation-test",
"./target/test-classes"));
paymentNode.start();
@@ -57,7 +57,7 @@ public class PaymentTestCase {
@Test
public void testPayment() {
- SCAClient client = (SCAClient)paymentNode;
+ Node client = (Node)paymentNode;
Payment payment = client.getService(Payment.class, "PaymentClient");
System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
index 4f64b20c4e..3fee35a1db 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
@@ -19,8 +19,8 @@
package scatours.payment.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.Payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
index b5639eb1f9..d4b14f7c88 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
- <import.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:paymentClient" />
+ <import.java package="com.tuscanyscatours.payment"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
index 642cebfd1c..b442a46101 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="paymentClient">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml
index 9be05ec4de..4cbe252e83 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-payment-spring</artifactId>
<name>Apache Tuscany SCA Tours Payment Spring Contribution</name>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
index 26926c7764..d0b1736e98 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
@@ -23,12 +23,12 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Requires;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.EagerInit;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Requires;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.customer.Customer;
import com.tuscanyscatours.customer.CustomerNotFoundException;
@@ -44,7 +44,7 @@ import com.tuscanyscatours.payment.creditcard.PayerType;
@Service(CustomerRegistry.class)
@Scope("COMPOSITE")
@EagerInit
-@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")
+@Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global")
public class CustomerRegistryImpl implements CustomerRegistry {
private volatile static int idGenerator = 0;
private Map<String, Customer> customers = new HashMap<String, Customer>();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml
index b480cc4aa1..976e2fc0b6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
- <export.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:payment" />
+ <export.java package="com.tuscanyscatours.payment"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite
index 1e5bae2a2b..48ef93ba2e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="payment">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java
index 8723c05624..09420600fb 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java
@@ -19,10 +19,10 @@
package scatours.payment;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,22 +33,22 @@ import com.tuscanyscatours.payment.Payment;
*
*/
public class PaymentTestCase {
- private static SCANode paymentNode;
- private static SCANode creditCardNode;
+ private static Node paymentNode;
+ private static Node creditCardNode;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
creditCardNode =
- SCANodeFactory.newInstance()
- .createSCANode("creditcard.composite",
- new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
+ NodeFactory.getInstance()
+ .createNode("creditcard.composite",
+ new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
creditCardNode.start();
paymentNode =
- SCANodeFactory.newInstance().createSCANode(null,
- new SCAContribution("payment-spring", "./target/classes"),
- new SCAContribution("payment-spring-test",
+ NodeFactory.getInstance().createNode(
+ new Contribution("payment-spring", "./target/classes"),
+ new Contribution("payment-spring-test",
"./target/test-classes"));
paymentNode.start();
@@ -56,7 +56,7 @@ public class PaymentTestCase {
@Test
public void testPayment() {
- SCAClient client = (SCAClient)paymentNode;
+ Node client = (Node)paymentNode;
Payment payment = client.getService(Payment.class, "PaymentClient");
System.out.println("Result = " + payment.makePaymentMember("c-0", 100.00f));
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
index 4f64b20c4e..3fee35a1db 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
@@ -19,8 +19,8 @@
package scatours.payment.client.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.Payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml
index b5639eb1f9..d4b14f7c88 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:scatours="http://tuscanyscatours.com/">
- <import.java package="com.tuscanyscatours.payment"/>
<deployable composite="scatours:paymentClient" />
+ <import.java package="com.tuscanyscatours.payment"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/payment-client.composite
index 642cebfd1c..b442a46101 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/payment-client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/payment-client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscanyscatours.com/"
name="paymentClient">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml
index 4ceebd71f7..3adfca89f4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml
@@ -2,7 +2,7 @@
<target name="init"/>
<target name="copy-resources" depends="init">
<copy todir="target/classes/META-INF" filtering="true">
- <fileset dir="." includes="LICENSE|NOTICE"/>
+ <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/>
</copy>
</target>
</project> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
index c0aac2e426..303122f92d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-policy-client</artifactId>
<name>Apache Tuscany SCA Tours Policy Client Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
index b1858782cf..2f69f4d6a0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
@@ -19,8 +19,8 @@
package scatours.client;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.Payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
index 3ccb9da245..583bda3361 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:client="http://client.scatours/">
- <import.java package="payment" />
<deployable composite="client:Client" />
+ <import.java package="payment" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
index 788dd81a92..6971c8d423 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://client.scatours/"
name="Client">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/pom.xml
index 68708e55e1..a08a3f06e0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contributions</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Tours Contributions</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml
index 436be14602..85388dde97 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-scatours</artifactId>
<name>Apache Tuscany SCA Tours SCATours Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java
index a1e0d6c91f..c3514d6910 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
import com.tuscanyscatours.common.TripItem;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java
index f9554342e9..720c739aeb 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
import com.tuscanyscatours.common.TripItem;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java
index 6ce03fbb86..9551ab7e2c 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
import com.tuscanyscatours.common.TripItem;
import com.tuscanyscatours.common.TripLeg;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
index 7a7f6b460d..9e664a874b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
@@ -18,9 +18,9 @@
*/
package com.tuscanyscatours.impl;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.SCAToursBooking;
import com.tuscanyscatours.SCAToursCart;
@@ -37,7 +37,7 @@ import com.tuscanyscatours.tripbooking.TripBooking;
* the outward facing bindings to be changed without changing the individual contributions
*/
@Scope("COMPOSITE")
-@Service(interfaces = {SCAToursSearch.class, SCAToursBooking.class, SCAToursCart.class})
+@Service({SCAToursSearch.class, SCAToursBooking.class, SCAToursCart.class})
public class SCAToursImpl implements SCAToursSearch, SCAToursBooking, SCAToursCart {
@Reference
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml
index 2728a88840..e16cf2c94f 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.common" />
<import.java package="com.tuscanyscatours.travelcatalog" />
<import.java package="com.tuscanyscatours.tripbooking" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml
index d7c97af652..4f91b07022 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-shoppingcart</artifactId>
<name>Apache Tuscany SCA Tours Shopping Cart Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
index 929f9895c6..ff453d6a78 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours.shoppingcart;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface CartCheckout {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
index 24affc4b23..0966c6b2b3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours.shoppingcart;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
import com.tuscanyscatours.common.TripItem;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java
index c7d03d765b..836f06ed7f 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java
@@ -18,9 +18,7 @@
*/
package com.tuscanyscatours.shoppingcart;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
import com.tuscanyscatours.common.TripItem;
@@ -28,7 +26,6 @@ import com.tuscanyscatours.common.TripItem;
* The CartStore service interface
*/
@Remotable
-@Conversational
public interface CartStore {
void addTrip(TripItem trip);
@@ -36,6 +33,5 @@ public interface CartStore {
TripItem[] getTrips();
- @EndsConversation
void reset();
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
index f9a1272695..a9729fb98b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours.shoppingcart;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
import com.tuscanyscatours.common.TripItem;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java
index 460b962526..ff83a7586a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java
@@ -21,11 +21,10 @@ package com.tuscanyscatours.shoppingcart.impl;
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Destroy;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.TripItem;
import com.tuscanyscatours.shoppingcart.CartStore;
@@ -34,10 +33,9 @@ import com.tuscanyscatours.shoppingcart.CartStore;
* An implementation of the CartStore service
*/
@Scope("CONVERSATION")
-@Service(interfaces = {CartStore.class})
+@Service({CartStore.class})
public class CartStoreImpl implements CartStore {
- @ConversationID
protected String cartId;
private List<TripItem> trips = new ArrayList<TripItem>();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
index 41c58e5266..daaf187dbb 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
@@ -22,11 +22,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.TripItem;
import com.tuscanyscatours.payment.Payment;
@@ -38,7 +38,7 @@ import com.tuscanyscatours.shoppingcart.CartUpdates;
/**
* An implementation of the ShoppingCart service
*/
-@Service(interfaces = {CartInitialize.class, CartUpdates.class, CartCheckout.class})
+@Service({CartInitialize.class, CartUpdates.class, CartCheckout.class})
public class ShoppingCartImpl implements CartInitialize, CartUpdates, CartCheckout {
@Reference
@@ -55,7 +55,7 @@ public class ShoppingCartImpl implements CartInitialize, CartUpdates, CartChecko
public String newCart() {
String cartId = UUID.randomUUID().toString();
ServiceReference<CartStore> cartStore = componentContext.getServiceReference(CartStore.class, "cartStore");
- cartStore.setConversationID(cartId);
+ // cartStore.setConversationID(cartId);
cartStores.put(cartId, cartStore.getService());
return cartId;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml
index 176c031c4c..55165fd9c4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.common" />
<export.java package="com.tuscanyscatours.payment" />
<export.java package="com.tuscanyscatours.shoppingcart" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml
index f02f8dffe1..c1591336c8 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-travelcatalog</artifactId>
<name>Apache Tuscany SCA Tours Travel Catalog Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
index e558439f82..53997a23c2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours.travelcatalog;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
import com.tuscanyscatours.common.TripItem;
import com.tuscanyscatours.common.TripLeg;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
index 90351720bb..c77b7a03c4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
@@ -23,14 +23,14 @@ import java.util.List;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Property;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.Search;
import com.tuscanyscatours.common.SearchCallback;
@@ -43,7 +43,7 @@ import com.tuscanyscatours.travelcatalog.TravelCatalogSearch;
* An implementation of the travel catalog service
*/
@Scope("COMPOSITE")
-@Service(interfaces = {TravelCatalogSearch.class})
+@Service({TravelCatalogSearch.class})
public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback {
@Reference
@@ -80,7 +80,7 @@ public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback {
ServiceReference<Search> dynamicHotelSearch = componentContext.getServiceReference(Search.class, "hotelSearch");
- dynamicHotelSearch.setCallbackID("HotelSearchCallbackID-" + tripLeg.getId());
+ // dynamicHotelSearch.setCallbackID("HotelSearchCallbackID-" + tripLeg.getId());
dynamicHotelSearch.getService().searchAsynch(tripLeg);
flightSearch.searchAsynch(tripLeg);
@@ -109,8 +109,8 @@ public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback {
public synchronized void searchResults(TripItem[] items) {
RequestContext requestContext = componentContext.getRequestContext();
- Object callbackID = requestContext.getServiceReference().getCallbackID();
- System.out.println("Asynch response - " + callbackID);
+ // Object callbackID = requestContext.getServiceReference().getCallbackID();
+ // System.out.println("Asynch response - " + callbackID);
if (items != null) {
for (int i = 0; i < items.length; i++) {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml
index b18ae45a09..7b104eab59 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.common" />
<import.java package="com.tuscanyscatours.currencyconverter" />
<export.java package="com.tuscanyscatours.travelcatalog" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml
index b2eba45a6b..91e6dd8856 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-trip</artifactId>
<name>Apache Tuscany SCA Tours Prepackaged Trip Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java
index ec90524518..a0aec4b777 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java
@@ -21,10 +21,10 @@ package com.tuscanyscatours.trip.impl;
import java.util.ArrayList;
import java.util.List;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Init;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.Book;
import com.tuscanyscatours.common.Search;
@@ -36,7 +36,7 @@ import com.tuscanyscatours.common.TripLeg;
* An implementation of the Trip service
*/
@Scope("STATELESS")
-@Service(interfaces = {Search.class, Book.class})
+@Service({Search.class, Book.class})
public class TripImpl implements Search, Book {
private List<TripInfo> trips = new ArrayList<TripInfo>();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml
index 7f2efe2de7..278d66acd1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<import.java package="com.tuscanyscatours.common"/>
<export.java package="com.tuscanyscatours.trip.impl"/>
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
index fd2cc073ec..29e2058023 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
@@ -19,10 +19,10 @@
package scatours.trip;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -34,15 +34,15 @@ import com.tuscanyscatours.common.TripItem;
*
*/
public class TripTestCase {
- private static SCANode tripNode;
+ private static Node tripNode;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
try {
tripNode =
- SCANodeFactory.newInstance().createSCANode("trip.composite",
- new SCAContribution("trip", "./target/classes"),
- new SCAContribution("trip-test", "./target/test-classes"));
+ NodeFactory.getInstance().createNode("trip.composite",
+ new Contribution("trip", "./target/classes"),
+ new Contribution("trip-test", "./target/test-classes"));
tripNode.start();
} catch (Exception ex) {
@@ -52,7 +52,7 @@ public class TripTestCase {
@Test
public void testPayment() {
- SCAClient client = (SCAClient)tripNode;
+ Node client = (Node)tripNode;
Book booking = client.getService(Book.class, "Trip/Book");
TripItem tripItem =
new TripItem("1234", "5678", TripItem.TRIP, "FS1DEC06", "Florence and Siena pre-packaged tour", "FLR",
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml
index 8d7ff59b0c..c16e387ad7 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml
@@ -17,14 +17,14 @@
* specific language governing permissions and limitations
* under the License.
-->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
<!-- PolicySets -->
<policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java"
- xmlns="http://www.osoa.org/xmlns/sca/1.0">
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<tuscany:jdkLogger name="myLogger">
<logLevel>FINER</logLevel>
</tuscany:jdkLogger>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite
index 06c449633c..d96a5ed8e2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://scatours"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
name="packagedtrip">
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml
index 42fca6278f..f45f92c464 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-tripbooking</artifactId>
<name>Apache Tuscany SCA Tours Trip Booking Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java
index 0693d40465..c5eaa95f19 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours.tripbooking;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
import com.tuscanyscatours.common.TripItem;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
index 5d1e1f2db5..e5846bae5d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
@@ -18,11 +18,11 @@
*/
package com.tuscanyscatours.tripbooking.impl;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.ServiceReference;
+import org.oasisopen.sca.annotation.Context;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.common.Book;
import com.tuscanyscatours.common.TripItem;
@@ -32,7 +32,7 @@ import com.tuscanyscatours.tripbooking.TripBooking;
/**
* An implementation of the TripBooking service
*/
-@Service(interfaces = {TripBooking.class})
+@Service({TripBooking.class})
public class TripBookingImpl implements TripBooking {
@Reference
@@ -82,7 +82,7 @@ public class TripBookingImpl implements TripBooking {
// add trip to the shopping cart
ServiceReference<CartUpdates> cart = componentContext.getServiceReference(CartUpdates.class, "cartUpdates");
- cart.setConversationID(cartId);
+ // cart.setConversationID(cartId);
cart.getService().addTrip(cartId, trip);
return trip;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/pom.xml
index cf87578add..916398106e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/distribution/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-distribution</artifactId>
<name>Apache Tuscany SCA Tours Distribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
index 94802269bb..3dcae3b88b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-domainconfig-fullapp</artifactId>
<name>Apache Tuscany SCA Tours Full App Domain Configuration</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite
index 284376538a..addf035219 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite
@@ -19,8 +19,8 @@
-->
<composite name="cloud.composite"
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:ns2="http://tuscany.apache.org/cloud">
<include name="ns2:ui" uri="http://tuscany.apache.org/cloud" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
index b6d9d51cbc..73dce21da1 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/cloud"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
index b42457154f..38dab5354e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/cloud"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
index 5c66ff2796..4a7429c3b0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/cloud"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
index 185112122c..56861dc4f3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/cloud"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
index 323700b4a0..0c0fcbc511 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/cloud"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
index b27b57fad5..4fb057536d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/cloud"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
index 7bec251965..fa19f52f7d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/cloud"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
index e86bef1c56..1328021ce9 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/cloud"
xmlns:s="http://tuscanyscatours.com/"
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
index b26f71aa94..2413fea1af 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
@@ -19,8 +19,8 @@
-->
<composite name="domain.composite"
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:ns2="http://tuscanyscatours.com/">
<include name="ns2:creditcard" uri="fullapp-creditcard" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
index 9cc529cd90..f07dde2e95 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-domainconfig-introducing</artifactId>
<name>Apache Tuscany SCA Tours Introducing Domain Configuration</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite
index 5d400e1be8..3163b640ac 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite
@@ -19,7 +19,7 @@
-->
<composite local="true" name="cloud"
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<include name="ns2:ToursNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
<include name="ns2:TripsNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
<include name="ns2:ClientNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
index adf8f0e9cb..4109f70a50 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://client.scatours/" targetNamespace="http://tuscany.apache.org/cloud" name="ClientNode">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://client.scatours/" targetNamespace="http://tuscany.apache.org/cloud" name="ClientNode">
<component name="ClientNode">
<t:implementation.node uri="introducing-client" composite="c:Client" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
index 6e8f7fadb6..5d2853f644 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://tuscanyscatours.com/" targetNamespace="http://tuscany.apache.org/cloud" name="ToursNode">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://tuscanyscatours.com/" targetNamespace="http://tuscany.apache.org/cloud" name="ToursNode">
<component name="ToursNode">
<t:implementation.node uri="introducing-tours" composite="c:Tours" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
index 9e4b454941..f0f1de9d9a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://goodvaluetrips.com/" targetNamespace="http://tuscany.apache.org/cloud" name="TripsNode">
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:c="http://goodvaluetrips.com/" targetNamespace="http://tuscany.apache.org/cloud" name="TripsNode">
<component name="TripsNode">
<t:implementation.node uri="introducing-trips" composite="c:Trips" />
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite
index ec0f71484b..b610acd5c9 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite
@@ -19,7 +19,7 @@
-->
<composite local="true" name="domain"
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0">
+ xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912">
<include name="ns2:Tours" uri="introducing-tours" xmlns:ns2="http://tuscanyscatours.com/"/>
<include name="ns2:Trips" uri="introducing-trips" xmlns:ns2="http://goodvaluetrips.com/"/>
<include name="ns2:Client" uri="introducing-client" xmlns:ns2="http://client.scatours/"/>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
index 6324f538bd..18a9e85bca 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-blog-feed</artifactId>
<name>Apache Tuscany SCA Tours Blog Feed Launcher</name>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java
index 8dc6956986..76ddbbb079 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java
@@ -21,16 +21,16 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class BlogFeedLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution feedContribution = locate("blog-feed");
+ Contribution feedContribution = locate("blog-feed");
- SCANode node = SCANodeFactory.newInstance().createSCANode("blog-feed.composite", feedContribution);
+ Node node = NodeFactory.getInstance().createNode("blog-feed.composite", feedContribution);
node.start();
System.out.println("Node started - Press enter to shutdown.");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml
index ea5ba3f930..d24e7b03ee 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-buildingblocks</artifactId>
<name>Apache Tuscany SCA Tours Building Blocks Launcher</name>
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java
index aaca0f44fa..6409f319e4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java
@@ -20,11 +20,8 @@
package scatours;
import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-import static scatours.launcher.LauncherUtil.locate;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class BuildingBlocksLauncher {
@@ -35,29 +32,29 @@ public class BuildingBlocksLauncher {
}
private static void runImpl() throws Exception {
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("tours-impl-client.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("tours-impl-client.composite",
locate("buildingblocks"),
locate("buildingblocks-client"));
node.start();
- Runnable client = ((SCAClient)node).getService(Runnable.class, "ToursClient/Runnable");
+ Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");
client.run();
node.stop();
}
private static void runImplInclude() throws Exception {
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("tours-impl-include-client.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("tours-impl-include-client.composite",
locate("introducing-trips"),
locate("buildingblocks"),
locate("buildingblocks-client"));
node.start();
- Runnable client = ((SCAClient)node).getService(Runnable.class, "ToursClient/Runnable");
+ Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");
client.run();
node.stop();
@@ -69,20 +66,20 @@ public class BuildingBlocksLauncher {
jmsBroker.setUseJmx(false);
jmsBroker.addConnector("tcp://localhost:61619");
- SCANode node1 =
- SCANodeFactory.newInstance().createSCANode("tours-appl.composite",
+ Node node1 =
+ NodeFactory.getInstance().createNode("tours-appl.composite",
locate("introducing-trips"),
locate("buildingblocks"));
- SCANode node2 =
- SCANodeFactory.newInstance().createSCANode("tours-appl-client.composite",
+ Node node2 =
+ NodeFactory.getInstance().createNode("tours-appl-client.composite",
locate("buildingblocks-client"));
jmsBroker.start();
node1.start();
node2.start();
- Runnable client = ((SCAClient)node2).getService(Runnable.class, "ApplClient/Runnable");
+ Runnable client = ((Node)node2).getService(Runnable.class, "ApplClient/Runnable");
client.run();
node2.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
index 30650908b9..93e38eee83 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-currency-converter-corba</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter CORBA Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java
index 0f9d0eca80..514fc9fb41 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java
@@ -21,27 +21,27 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.currencyconverter.CurrencyConverter;
public class CurrencyConverterCORBALauncher {
public static void main(String[] args) throws Exception {
- SCAContribution currencyCORBAContribution = locate("currency-corba");
- SCAContribution currencyContribution = locate("currency");
+ Contribution currencyCORBAContribution = locate("currency-corba");
+ Contribution currencyContribution = locate("currency");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("currency-converter-corba.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("currency-converter-corba.composite",
currencyContribution,
currencyCORBAContribution);
node.start();
System.out.println("Quick currency converter test");
- CurrencyConverter converter = ((SCAClient)node).getService(CurrencyConverter.class, "CurrencyConverter");
+ CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");
System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java
index fe5c98bf02..80d623d22d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java
@@ -18,7 +18,7 @@
*/
package scatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
index d30733bf01..34a0af3acd 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-currency-converter-jms</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter JMS Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java
index 6da4e7e162..306ec1a9bf 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java
@@ -22,9 +22,9 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class CurrencyConverterJMSLauncher {
@@ -35,11 +35,11 @@ public class CurrencyConverterJMSLauncher {
jmsBroker.addConnector("tcp://localhost:61619");
jmsBroker.start();
- SCAContribution currencyJMSContribution = locate("currency-jms");
- SCAContribution currencyContribution = locate("currency");
+ Contribution currencyJMSContribution = locate("currency-jms");
+ Contribution currencyContribution = locate("currency");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("currency-converter-jms.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("currency-converter-jms.composite",
currencyContribution,
currencyJMSContribution);
node.start();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
index b12cfa44ad..588fd37dc3 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-currency-converter-rmi</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter RMI Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
index b1f783bfba..3ebd23b2d0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
@@ -18,7 +18,7 @@
*/
package com.tuscanyscatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java
index 81d9e19c60..8af4a90f57 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java
@@ -21,27 +21,27 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import com.tuscanyscatours.currencyconverter.CurrencyConverter;
public class CurrencyConverterRMILauncher {
public static void main(String[] args) throws Exception {
- SCAContribution currencyRMIContribution = locate("currency-rmi");
- SCAContribution currencyContribution = locate("currency");
+ Contribution currencyRMIContribution = locate("currency-rmi");
+ Contribution currencyContribution = locate("currency");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("currency-converter-rmi.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("currency-converter-rmi.composite",
currencyContribution,
currencyRMIContribution);
node.start();
System.out.println("Quick currency converter test");
- CurrencyConverter converter = ((SCAClient)node).getService(CurrencyConverter.class, "CurrencyConverter");
+ CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");
System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
index 5ff8984dbf..f231094902 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-currency-converter-ws</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter Web Service Launcher</name>
@@ -60,14 +60,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
index 2425d3f483..c844463cbf 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
@@ -21,27 +21,27 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.currencyconverter.CurrencyConverter;
public class CurrencyConverterWSLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution currencyWSContribution = locate("currency-ws");
- SCAContribution currencyContribution = locate("currency");
+ Contribution currencyWSContribution = locate("currency-ws");
+ Contribution currencyContribution = locate("currency");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("currency-converter-ws.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("currency-converter-ws.composite",
currencyContribution,
currencyWSContribution);
node.start();
System.out.println("Quick currency converter test");
- CurrencyConverter converter = ((SCAClient)node).getService(CurrencyConverter.class, "CurrencyConverter");
+ CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");
System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
index fe5c98bf02..80d623d22d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
@@ -18,7 +18,7 @@
*/
package scatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
index af29324117..9b3f0db297 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-currency-converter</artifactId>
<name>Apache Tuscany SCA Tours Currency Converter Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java
index cacd579b3b..7d7d6e3987 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java
@@ -21,23 +21,23 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.currencyconverter.CurrencyConverter;
public class CurrencyConverterLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution currencyContribution = locate("currency");
+ Contribution currencyContribution = locate("currency");
- SCANode node = SCANodeFactory.newInstance().createSCANode("currency-converter.composite", currencyContribution);
+ Node node = NodeFactory.getInstance().createNode("currency-converter.composite", currencyContribution);
node.start();
System.out.println("Quick currency converter test");
- CurrencyConverter converter = ((SCAClient)node).getService(CurrencyConverter.class, "CurrencyConverter");
+ CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");
System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java
index fe5c98bf02..80d623d22d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java
@@ -18,7 +18,7 @@
*/
package scatours.currencyconverter;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The CurrencyConverter service interface
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
index 7fef1796f7..d6645c4895 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-databinding</artifactId>
<name>Apache Tuscany SCA Tours Databinding Launcher</name>
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java
index 6271c60d53..d7cae1e280 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java
@@ -21,22 +21,22 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class DatabindingLauncher {
public static void main(String[] args) throws Exception {
- SCANode node1 = SCANodeFactory.newInstance().createSCANode(null,
+ Node node1 = NodeFactory.getInstance().createNode(
locate("payment-java"),
locate("databinding-client"));
- SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, locate("creditcard-payment-sdo"));
+ Node node2 = NodeFactory.getInstance().createNode(locate("creditcard-payment-sdo"));
node1.start();
node2.start();
- Runnable runner = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable");
+ Runnable runner = ((Node)node1).getService(Runnable.class, "TestClient/Runnable");
runner.run();
node1.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
index b8067e75f2..4dd36bfcfc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-feed-logger</artifactId>
<name>Apache Tuscany SCA Tours Feed Logger Launcher</name>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
index 4aea24dbfe..35c3560645 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
@@ -21,22 +21,22 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.feedlogger.FeedLogger;
public class FeedLoggerLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution feedContribution = locate("feed-logger");
+ Contribution feedContribution = locate("feed-logger");
- SCANode node = SCANodeFactory.newInstance().createSCANode("feed-logger.composite", feedContribution);
+ Node node = NodeFactory.getInstance().createNode("feed-logger.composite", feedContribution);
node.start();
- FeedLogger logger = ((SCAClient)node).getService(FeedLogger.class, "FeedLogger");
+ FeedLogger logger = ((Node)node).getService(FeedLogger.class, "FeedLogger");
logger.logFeeds(5);
node.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
index 95d2077d0e..c0e8f0c83d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-fullapp-domain</artifactId>
<name>Apache Tuscany SCA Tours Full App Domain Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
index 34d2007daa..26bab49e0d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-fullapp-nodes</artifactId>
<name>Apache Tuscany SCA Tours Full Application Nodes Launcher</name>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
index 4d6459b749..cd618a45e0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
@@ -21,41 +21,41 @@ package scatours;
import java.io.IOException;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class FullAppNodesLauncher {
public static void main(String[] args) throws Exception {
- SCANode nodeCreditcard =
- SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/creditcard");
+ Node nodeCreditcard =
+ NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/creditcard");
nodeCreditcard.start();
- SCANode nodePayment =
- SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/payment");
+ Node nodePayment =
+ NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/payment");
nodePayment.start();
- SCANode nodeShoppingcart =
- SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/shoppingcart");
+ Node nodeShoppingcart =
+ NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/shoppingcart");
nodeShoppingcart.start();
- SCANode nodeCurrency =
- SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/currency");
+ Node nodeCurrency =
+ NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/currency");
nodeCurrency.start();
- SCANode nodePackagedtrip =
- SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/packagedtrip");
+ Node nodePackagedtrip =
+ NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/packagedtrip");
nodePackagedtrip.start();
- SCANode nodeBespoketrip =
- SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/bespoketrip");
+ Node nodeBespoketrip =
+ NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/bespoketrip");
nodeBespoketrip.start();
- SCANode nodeFrontend =
- SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/coordination");
+ Node nodeFrontend =
+ NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/coordination");
nodeFrontend.start();
- SCANode nodeUI = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ui");
+ Node nodeUI = NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/ui");
nodeUI.start();
System.out.println("Point your browser at - http://localhost:8080/scatours/ ");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
index 24b4624912..c9e810e44a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-fullapp</artifactId>
<name>Apache Tuscany SCA Tours Full Application Launcher</name>
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
index ab1b7d031b..c3f68e2d60 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
@@ -23,14 +23,14 @@ import static scatours.launcher.LauncherUtil.locate;
import java.io.IOException;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class FullAppLauncher {
public static void main(String[] args) throws Exception {
- SCANode node =
- SCANodeFactory.newInstance().createSCANode(null,
+ Node node =
+ NodeFactory.getInstance().createNode(
locate("common"),
locate("currency"),
locate("hotel"),
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
index dcad902807..0c83357935 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-help-pages</artifactId>
<name>Apache Tuscany SCA Tours Help Pages Launcher</name>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java
index a72f5c4c54..4b8960e6ae 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java
@@ -21,16 +21,16 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class HelpPagesLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution helpContribution = locate("help-pages");
+ Contribution helpContribution = locate("help-pages");
- SCANode node = SCANodeFactory.newInstance().createSCANode("help-pages.composite", helpContribution);
+ Node node = NodeFactory.getInstance().createNode("help-pages.composite", helpContribution);
node.start();
System.out.println("Node started - Press enter to shutdown.");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
index 7e15913e53..c259624844 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-interaction</artifactId>
<name>Apache Tuscany SCA Tours Interaction Launcher</name>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
index b3e0e52f2e..9b66a5c838 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
@@ -21,23 +21,23 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class InteractionLauncher {
public static void main(String[] args) throws Exception {
- SCANode node1 =
- SCANodeFactory.newInstance().createSCANode("client.composite",
+ Node node1 =
+ NodeFactory.getInstance().createNode("client.composite",
locate("common"),
locate("currency"),
locate("calendar"),
locate("shoppingcart"),
locate("interaction-client"));
- SCANode node2 =
- SCANodeFactory.newInstance().createSCANode("service.composite",
+ Node node2 =
+ NodeFactory.getInstance().createNode("service.composite",
locate("common"),
locate("hotel"),
locate("flight"),
@@ -46,22 +46,22 @@ public class InteractionLauncher {
node2.start();
node1.start();
- Runnable localInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionLocalClient/Runnable");
+ Runnable localInteraction = ((Node)node1).getService(Runnable.class, "InteractionLocalClient/Runnable");
localInteraction.run();
- Runnable remoteInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionRemoteClient/Runnable");
+ Runnable remoteInteraction = ((Node)node1).getService(Runnable.class, "InteractionRemoteClient/Runnable");
remoteInteraction.run();
Runnable requestResponseInteraction =
- ((SCAClient)node1).getService(Runnable.class, "InteractionRequestResponseClient/Runnable");
+ ((Node)node1).getService(Runnable.class, "InteractionRequestResponseClient/Runnable");
requestResponseInteraction.run();
Runnable onewayCallbackInteraction =
- ((SCAClient)node1).getService(Runnable.class, "InteractionOneWayCallbackClient/Runnable");
+ ((Node)node1).getService(Runnable.class, "InteractionOneWayCallbackClient/Runnable");
onewayCallbackInteraction.run();
Runnable conversationalInteraction =
- ((SCAClient)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");
+ ((Node)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");
conversationalInteraction.run();
node1.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
index 878f27844c..d7dea0d179 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-introducing-client</artifactId>
<name>Apache Tuscany SCA Tours Introducing Client Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java
index f261ef6e27..ade9ffad42 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java
@@ -19,18 +19,17 @@
package scatours;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class IntroducingClientLauncher {
public static void main(String[] args) throws Exception {
- SCANode node =
- SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ClientNode");
+ Node node =
+ NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/ClientNode");
node.start();
- Runnable client = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
+ Runnable client = node.getService(Runnable.class, "TestClient/Runnable");
client.run();
node.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
index c428b4b87f..817f4409e5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-introducing-domain</artifactId>
<name>Apache Tuscany SCA Tours Introducing Domain Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
index 1886b977a4..77b8223a8d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-introducing-tours</artifactId>
<name>Apache Tuscany SCA Tours Introducing Tours Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
index 9cb30beb3f..ccd54dc055 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-introducing-trips</artifactId>
<name>Apache Tuscany SCA Tours Introducing Trips Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
index 98c8627d6c..4294dd2a96 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-introducing</artifactId>
<name>Apache Tuscany SCA Tours Introducing Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
index 4ad19762d9..7008c834b8 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
@@ -21,22 +21,22 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class IntroducingLauncher {
public static void main(String[] args) throws Exception {
- SCANode node =
- SCANodeFactory.newInstance().createSCANode(null,
+ Node node =
+ NodeFactory.getInstance().createNode(
locate("introducing-tours"),
locate("introducing-trips"),
locate("introducing-client"));
node.start();
- Runnable proxy = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
+ Runnable proxy = ((Node)node).getService(Runnable.class, "TestClient/Runnable");
proxy.run();
node.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java
index 573d2e76bd..5270cbabe6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java
@@ -18,10 +18,10 @@
*/
package scatours;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -33,25 +33,25 @@ import org.junit.Test;
*/
public class IntroducingTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
node =
- SCANodeFactory.newInstance()
- .createSCANode(null,
- new SCAContribution("introducing-tours",
+ NodeFactory.getInstance()
+ .createNode(
+ new Contribution("introducing-tours",
"../../contributions/introducing-tours/target/classes"),
- new SCAContribution("introducing-trips",
+ new Contribution("introducing-trips",
"../../contributions/introducing-trips/target/classes"),
- new SCAContribution("introducing-client",
+ new Contribution("introducing-client",
"../../contributions/introducing-client/target/classes"));
node.start();
}
@Test
public void testClient() throws Exception {
- Runnable proxy = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");
+ Runnable proxy = ((Node)node).getService(Runnable.class, "TestClient/Runnable");
proxy.run();
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
index 133ed2a0b7..ffc19a754a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-jumpstart</artifactId>
<name>Apache Tuscany SCA Tours Jump Start Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
index 1ded112193..f478aadae0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
@@ -21,21 +21,20 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class JumpstartLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution gvtContribution = locate("introducing-trips");
+ Contribution gvtContribution = locate("introducing-trips");
- SCANode node = SCANodeFactory.newInstance().createSCANode("trips.composite", gvtContribution);
+ Node node = NodeFactory.getInstance().createNode("trips.composite", gvtContribution);
node.start();
- Trips tripProvider = ((SCAClient)node).getService(Trips.class, "TripProvider/Trips");
+ Trips tripProvider = node.getService(Trips.class, "TripProvider/Trips");
System.out.println("Trip boooking code = " + tripProvider.checkAvailability("FS1APR4", 1));
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
index a7abf8e08d..32db895bf4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
@@ -18,7 +18,7 @@
*/
package scatours;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Trips {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java
index 4da7c54917..12654494ac 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java
@@ -18,10 +18,10 @@
*/
package scatours;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -31,21 +31,21 @@ import org.junit.Test;
*/
public class JumpstartTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
node =
- SCANodeFactory.newInstance()
- .createSCANode("trips.composite",
- new SCAContribution("introducing-trips",
+ NodeFactory.getInstance()
+ .createNode("trips.composite",
+ new Contribution("introducing-trips",
"../../contributions/introducing-trips/target/classes"));
node.start();
}
@Test
public void testClient() throws Exception {
- Trips tripProvider = ((SCAClient)node).getService(Trips.class, "TripProvider/Trips");
+ Trips tripProvider = ((Node)node).getService(Trips.class, "TripProvider/Trips");
System.out.println("Trip boooking code = " + tripProvider.checkAvailability("FS1APR4", 2));
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
index ec5957081f..1670a304a4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-notification-corba</artifactId>
<name>Apache Tuscany SCA Tours Notification CORBA Service Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java
index 44b94b3a59..c245dc57fb 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java
@@ -21,27 +21,27 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.notification.Notification;
public class NotificationCORBALauncher {
public static void main(String[] args) throws Exception {
- SCAContribution notificationContribution = locate("notification");
- SCAContribution notificationCORBAContribution = locate("notification-corba");
+ Contribution notificationContribution = locate("notification");
+ Contribution notificationCORBAContribution = locate("notification-corba");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("notification-corba.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("notification-corba.composite",
notificationContribution,
notificationCORBAContribution);
node.start();
System.out.println("Quick notification test");
- Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
+ Notification notification = ((Node)node).getService(Notification.class, "Notification");
String accountID = "1234";
String subject = "Holiday payment taken";
String message = "Payment of £102.37 accepted...";
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
index e5c3d549a9..6f5d074213 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-notification-ejb</artifactId>
<name>Apache Tuscany SCA Tours Notification EJB Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java
index 2d843e9ff9..d7b44c9c59 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java
@@ -23,10 +23,10 @@ import static scatours.launcher.LauncherUtil.locate;
import javax.naming.Context;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.notification.Notification;
@@ -36,17 +36,17 @@ public class NotificationEJBLauncher {
System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
System.setProperty(Context.PROVIDER_URL, "ejbd://localhost:4201");
- SCAContribution notificationContribution = locate("notification");
- SCAContribution notificationEJBContribution = locate("notification-ejb");
+ Contribution notificationContribution = locate("notification");
+ Contribution notificationEJBContribution = locate("notification-ejb");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("notification-ejb.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("notification-ejb.composite",
notificationContribution,
notificationEJBContribution);
node.start();
System.out.println("Quick notification test");
- Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
+ Notification notification = ((Node)node).getService(Notification.class, "Notification");
String accountID = "1234";
String subject = "Holiday payment taken";
String message = "Payment of £102.37 accepted...";
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
index dd0a198622..2413e619b6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-notification-jms</artifactId>
<name>Apache Tuscany SCA Tours Notification JMS Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java
index c2ffda0725..55b0c0830a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java
@@ -21,21 +21,21 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.notification.Notification;
public class NotificationJMSLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution notificationContribution = locate("notification");
- SCAContribution notificationJMSContribution = locate("notification-jms");
+ Contribution notificationContribution = locate("notification");
+ Contribution notificationJMSContribution = locate("notification-jms");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("notification-jms.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("notification-jms.composite",
notificationContribution,
notificationJMSContribution);
@@ -43,7 +43,7 @@ public class NotificationJMSLauncher {
node.start();
System.out.println("Quick notification test");
- Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
+ Notification notification = ((Node)node).getService(Notification.class, "Notification");
String accountID = "1234";
String subject = "Holiday payment taken";
String message = "Payment of £102.37 accepted...";
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
index f6fea913fe..fe3140acb9 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-notification-rmi</artifactId>
<name>Apache Tuscany SCA Tours Notification RMI Launcher</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
index 2904349a49..48d229f2f0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
@@ -21,27 +21,27 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.notification.Notification;
public class NotificationRMILauncher {
public static void main(String[] args) throws Exception {
- SCAContribution notificationContribution = locate("notification");
- SCAContribution notificationRMIContribution = locate("notification-rmi");
+ Contribution notificationContribution = locate("notification");
+ Contribution notificationRMIContribution = locate("notification-rmi");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("notification-rmi.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("notification-rmi.composite",
notificationContribution,
notificationRMIContribution);
node.start();
System.out.println("Quick notification test");
- Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
+ Notification notification = ((Node)node).getService(Notification.class, "Notification");
String accountID = "1234";
String subject = "Holiday payment taken";
String message = "Payment of £102.37 accepted...";
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
index 4625a6e85c..5e666379f6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-notification-ws</artifactId>
<name>Apache Tuscany SCA Tours Notification Web Service Launcher</name>
@@ -59,14 +59,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java
index fbdb1500f5..8957e1ddf0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java
@@ -21,27 +21,27 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import scatours.notification.Notification;
public class NotificationWSLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution notificationContribution = locate("notification");
- SCAContribution notificationWSContribution = locate("notification-ws");
+ Contribution notificationContribution = locate("notification");
+ Contribution notificationWSContribution = locate("notification-ws");
- SCANode node =
- SCANodeFactory.newInstance().createSCANode("notification-ws.composite",
+ Node node =
+ NodeFactory.getInstance().createNode("notification-ws.composite",
notificationContribution,
notificationWSContribution);
node.start();
System.out.println("Quick notification test");
- Notification notification = ((SCAClient)node).getService(Notification.class, "Notification");
+ Notification notification = ((Node)node).getService(Notification.class, "Notification");
String accountID = "1234";
String subject = "Holiday payment taken";
String message = "Payment of £102.37 accepted...";
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
index 498ee1eb53..a3c6710ec4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-payment-bpel</artifactId>
<name>Apache Tuscany SCA Tours Payment BPEL Launcher</name>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java
index 45df91a5e9..2107c6ebcd 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java
@@ -21,23 +21,23 @@ package scatours.payment;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import com.tuscanyscatours.payment.Payment;
public class PaymentLauncher {
public static void main(String[] args) throws Exception {
- SCANode node = SCANodeFactory.newInstance().createSCANode(null,
+ Node node = NodeFactory.getInstance().createNode(
locate("payment-bpel-process"),
locate("payment-bpel"),
locate("creditcard-payment-jaxb"),
locate("emailgateway"));
node.start();
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
Payment payment = client.getService(Payment.class, "Payment/paymentPartnerLink");
System.out.println("Payment BPEL test");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
index 3631ee365a..6942fa7307 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-payment-groovy</artifactId>
<name>Apache Tuscany SCA Tours Payment Groovy Launcher</name>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java
index 8dbf39b514..46edb706fc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java
@@ -21,22 +21,22 @@ package scatours.payment;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import com.tuscanyscatours.payment.Payment;
public class PaymentLauncher {
public static void main(String[] args) throws Exception {
- SCANode node = SCANodeFactory.newInstance().createSCANode(null,
+ Node node = NodeFactory.getInstance().createNode(
locate("payment-groovy"),
locate("creditcard-payment-jaxb"),
locate("emailgateway"));
node.start();
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
Payment payment = client.getService(Payment.class, "Payment");
System.out.println("Payment Groovy test");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
index 3f6fbe1439..c0177e8afa 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-payment-java-policy</artifactId>
<name>Apache Tuscany SCA Tours Payment Java Policy Launcher</name>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java
index e5bd98ff2b..cda3ebd091 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java
@@ -21,21 +21,21 @@ package scatours.payment;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import com.tuscanyscatours.payment.Payment;
public class PaymentLauncher {
public static void main(String[] args) throws Exception {
- SCANode node = SCANodeFactory.newInstance().createSCANode(null,
+ Node node = NodeFactory.getInstance().createNode(
locate("payment-java-policy"),
locate("creditcard-payment-jaxb-policy"));
node.start();
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
Payment payment = client.getService(Payment.class, "Payment");
System.out.println("Payment Java Policy test");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
index f9d5255938..c8889d109a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-payment-java</artifactId>
<name>Apache Tuscany SCA Tours Payment Java Launcher</name>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java
index 8d5cc8765d..cc80ec4128 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java
@@ -21,21 +21,21 @@ package scatours.payment;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import com.tuscanyscatours.payment.Payment;
public class PaymentLauncher {
public static void main(String[] args) throws Exception {
- SCANode node = SCANodeFactory.newInstance().createSCANode(null,
+ Node node = NodeFactory.getInstance().createNode(
locate("payment-java"),
locate("creditcard-payment-jaxb"));
node.start();
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
Payment payment = client.getService(Payment.class, "Payment");
System.out.println("Payment Java test");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
index a03f2d0d51..a4524fc728 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-payment-spring-scatag</artifactId>
<name>Apache Tuscany SCA Tours Payment Spring SCATag Launcher</name>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java
index 5760fe0d72..7e5d7225e5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java
@@ -21,21 +21,21 @@ package scatours.payment;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import com.tuscanyscatours.payment.Payment;
public class PaymentLauncher {
public static void main(String[] args) throws Exception {
- SCANode node = SCANodeFactory.newInstance().createSCANode(null,
+ Node node = NodeFactory.getInstance().createNode(
locate("payment-spring-scatag"),
locate("creditcard-payment-jaxb"));
node.start();
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
Payment payment = client.getService(Payment.class, "Payment/Payment");
System.out.println("Payment Spring SCATag test");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
index c57b5e2e24..23660aa8a5 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-payment-spring</artifactId>
<name>Apache Tuscany SCA Tours Payment Spring Launcher</name>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java
index 6917b9c57b..d877d55569 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java
@@ -21,21 +21,21 @@ package scatours.payment;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import com.tuscanyscatours.payment.Payment;
public class PaymentLauncher {
public static void main(String[] args) throws Exception {
- SCANode node = SCANodeFactory.newInstance().createSCANode(null,
+ Node node = NodeFactory.getInstance().createNode(
locate("payment-spring"),
locate("creditcard-payment-jaxb"));
node.start();
- SCAClient client = (SCAClient)node;
+ Node client = (Node)node;
Payment payment = client.getService(Payment.class, "Payment/Payment");
System.out.println("Payment Spring test");
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml
index 4ceebd71f7..3adfca89f4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml
@@ -2,7 +2,7 @@
<target name="init"/>
<target name="copy-resources" depends="init">
<copy todir="target/classes/META-INF" filtering="true">
- <fileset dir="." includes="LICENSE|NOTICE"/>
+ <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/>
</copy>
</target>
</project> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
index bd11cebf24..05964e23dd 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-launcher-policy</artifactId>
<name>Apache Tuscany SCA Tours Policy Launcher</name>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
index b48c4e88ec..8fc3e92059 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
@@ -21,26 +21,26 @@ package scatours;
import static scatours.launcher.LauncherUtil.locate;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class PolicyLauncher {
public static void main(String[] args) throws Exception {
- SCANode node1 =
- SCANodeFactory.newInstance().createSCANode(null,
+ Node node1 =
+ NodeFactory.getInstance().createNode(
locate("policy-client"),
locate("payment-java-policy"));
node1.start();
- SCANode node2 = SCANodeFactory.newInstance().createSCANode(null,
+ Node node2 = NodeFactory.getInstance().createNode(
locate("creditcard-payment-jaxb-policy"));
node2.start();
- Runnable client = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable");
+ Runnable client = ((Node)node1).getService(Runnable.class, "TestClient/Runnable");
client.run();
node1.stop();
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml
index 3d8738dc86..f0211eafd0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-launchers</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Tours Launchers</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/pom.xml
index 6a38715996..1be8251598 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/pom.xml
@@ -22,11 +22,11 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.6</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<artifactId>scatours</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<name>Apache Tuscany SCA Tours Travel Sample</name>
<repositories>
@@ -94,18 +94,22 @@
</profiles>
<properties>
- <scatours.version>1.0-SNAPSHOT</scatours.version>
- <tuscany.version>1.6</tuscany.version>
+ <scatours.version>2.0-SNAPSHOT</scatours.version>
+ <tuscany.version>2.0-SNAPSHOT</tuscany.version>
</properties>
<modules>
<module>util</module>
<module>contributions</module>
+<!--
<module>domainconfig</module>
+-->
<module>launchers</module>
<module>services</module>
<module>clients</module>
+<!--
<module>distribution</module>
+-->
</modules>
</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml
index 958292698e..b0ea6b919a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-service-creditcard-payment-jaxws</artifactId>
<name>Apache Tuscany SCA Tours Credit Card Payment JAX-WS Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml
index 0c8812cffd..1dbc8effad 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-services</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Tours non-SCA Services</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml
index 340f043ca5..3f64d66a2d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-service-smsgateway-corba</artifactId>
<name>Apache Tuscany SCA Tours SMS Gateway CORBA Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml
index 9be6e6647d..8dd65669fc 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-service-smsgateway-ejb</artifactId>
<name>Apache Tuscany SCA Tours SMS Gateway EJB Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
index a833c03b9e..82e7f28c78 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-service-smsgateway-jaxws</artifactId>
<name>Apache Tuscany SCA Tours SMS Gateway JAX-WS Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml
index 9f1de49e6d..e2767a4966 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-service-smsgateway-jms</artifactId>
<name>Apache Tuscany SCA Tours SMS Gateway JMS Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml
index 3f91e23315..16b9fc1270 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-service-smsgateway-rmi</artifactId>
<name>Apache Tuscany SCA Tours SMS Gateway RMI Service</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml
index 7f02dc408e..0a1daf914b 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-util-jaxws-runtime</artifactId>
<name>Apache Tuscany SCA Tours JAX-WS Runtime Dependencies for JDK 5</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml
index a499139eff..afb66cc792 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-util-launcher-common</artifactId>
<name>Apache Tuscany SCA Tours Common Utility for Launchers</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
index 0cae436c82..02a32ecf04 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
@@ -21,9 +21,9 @@ package scatours.launcher;
import java.io.File;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
/**
* This utility locates SCA contributions by name so that the launcher can work with various environments where
@@ -34,9 +34,9 @@ public class LauncherUtil {
/**
* Locate an SCA contribution by name
* @param name The name of the SCA contribution archive
- * @return The SCAContribution
+ * @return The Contribution
*/
- public static SCAContribution locate(String name) {
+ public static Contribution locate(String name) {
// Try to use the target/classes directory inside Eclipse/Maven
File file = new File("../../contributions/" + name + "/target/classes");
if (!file.exists()) {
@@ -54,18 +54,18 @@ public class LauncherUtil {
}
}
}
- return new SCAContribution(name, file.toURI().toString());
+ return new Contribution(name, file.toURI().toString());
}
/**
* Locate an SCA contribution by replacing the ${name} in the pattern
* @param urlPattern The url pattern that contains ${name}
* @param name The name of the contribution archive
- * @return The SCAContribution
+ * @return The Contribution
*/
- public static SCAContribution locate(String urlPattern, String name) {
+ public static Contribution locate(String urlPattern, String name) {
String url = urlPattern.replace("${name}", name);
- return new SCAContribution(name, url);
+ return new Contribution(name, url);
}
/**
@@ -74,13 +74,13 @@ public class LauncherUtil {
* @param contributionNames
* @return
*/
- public static SCANode createNode(String composite, String... contributionNames) {
- SCAContribution[] contributions = new SCAContribution[contributionNames.length];
+ public static Node createNode(String composite, String... contributionNames) {
+ Contribution[] contributions = new Contribution[contributionNames.length];
int index = 0;
for (String name : contributionNames) {
contributions[index++] = locate(name);
}
- SCANode node = SCANodeFactory.newInstance().createSCANode(composite, contributions);
+ Node node = NodeFactory.getInstance().createNode(composite, contributions);
return node;
}
}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml
index b78fd646d6..c6b5a02097 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-util-openejb-runtime</artifactId>
<name>Apache Tuscany SCA Tours OpenEJB Runtime Dependencies</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml
index 7f987f9afd..6426cd5189 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml
@@ -22,10 +22,10 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<artifactId>scatours-util</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Tours Utilities</name>