diff options
Diffstat (limited to '')
-rw-r--r-- | sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml | 28 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite (renamed from sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite) | 20 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.html (renamed from sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.html) | 0 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.odg (renamed from sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg) | bin | 11880 -> 11880 bytes | |||
-rw-r--r-- | sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.png (renamed from sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png) | bin | 16554 -> 16554 bytes | |||
-rw-r--r-- | sandbox/travelsample/contributions/fullapp-ui/src/main/resources/style.css (renamed from sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/style.css) | 0 |
6 files changed, 9 insertions, 39 deletions
diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 9512c64b56..0000000000 --- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:scatours="http://scatours"> - <deployable composite="scatours:ui"/> - <import.java package="scatours"/> - <import.java package="scatours.common"/> - <import.java package="scatours.tripbooking"/> - <import.java package="scatours.travelcatalog"/> - <import.java package="scatours.shoppingcart"/> -</contribution>
\ No newline at end of file diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite index cd76747cb5..acc92c10b2 100644 --- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.composite +++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite @@ -18,10 +18,8 @@ * under the License. --> <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scatours" - xmlns:scatours="http://scatours" + targetNamespace="http://tuscanyscatours.com/" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:pp="http://www.example.org/PaymentProcess" name="ui"> <component name="scatours"> @@ -29,19 +27,19 @@ <service name="Widget"> <tuscany:binding.http uri="/scatours"/> </service> - <reference name="scaToursCatalog" target="SCAToursComponent/SCAToursSearch"> + <reference name="scaToursCatalog" target="SCATours/SCAToursSearch"> <tuscany:binding.jsonrpc/> </reference> - <reference name="scaToursBooking" target="SCAToursComponent/SCAToursBooking"> + <reference name="scaToursBooking" target="SCATours/SCAToursBooking"> <tuscany:binding.jsonrpc/> </reference> - <reference name="scaToursCart" target="SCAToursComponent/SCAToursCart"> + <reference name="scaToursCart" target="SCATours/SCAToursCart"> <tuscany:binding.jsonrpc/> </reference> </component> - <component name="SCAToursComponent"> - <implementation.java class="scatours.SCAToursImpl"/> + <component name="SCATours"> + <implementation.java class="com.tuscanyscatours.impl.SCAToursImpl"/> <service name="SCAToursSearch"> <tuscany:binding.jsonrpc/> </service> @@ -51,9 +49,9 @@ <service name="SCAToursCart"> <tuscany:binding.jsonrpc/> </service> - <reference name="travelCatalogSearch" target="TravelCatalogComponent/TravelCatalogSearch"/> - <reference name="tripBooking" target="TripBookingComponent/TripBooking"/> - <reference name="shoppingCart" target="ShoppingCartComponent/ShoppingCart"/> + <reference name="travelCatalogSearch" target="TravelCatalog/TravelCatalogSearch"/> + <reference name="tripBooking" target="TripBooking"/> + <reference name="shoppingCart" target="ShoppingCart"/> </component> </composite> diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.html b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.html index e53d4fd27f..e53d4fd27f 100644 --- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.html +++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.html diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.odg Binary files differindex 8466377374..8466377374 100644 --- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.odg +++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.odg diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.png Binary files differindex 563bf4ea91..563bf4ea91 100644 --- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/scatours.png +++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.png diff --git a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/style.css b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/style.css index 6e17c2747b..6e17c2747b 100644 --- a/sandbox/travelsample/contributions/fullapp-ui-contribution/src/main/resources/style.css +++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/style.css |