Change ATOM and RSS feed representations to use name value pairs instead of just strings, to allow support for all ATOM and RSS attributes and avoid confusion with non-feed string results.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1079292 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 0 insertions, 208 deletions

diff --git a/sca-cpp/trunk/modules/edit/apps/travel/app.composite b/sca-cpp/trunk/modules/edit/apps/travel/app.composite
deleted file mode 100644
index 40a260e0a9..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/travel/app.composite
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" targetNamespace="http://tuscanyscatours.com/" name="travel">
- <service name="SCAToursUserInterface" promote="SCAToursUserInterface"/>
- <component name="SCAToursUserInterface" t:color="green1">
-  <t:implementation.widget location="scatours.html"/>
-  <service name="Widget">
-   <t:binding.http uri="/scatours"/>
-  </service>
-  <reference name="scaToursCatalog" target="SCATours/SCAToursSearch" t:align="bottom">
-   <t:binding.jsonrpc></t:binding.jsonrpc>
-  </reference>
- </component>
- <component name="SCATours">
-  <implementation.java class="com.tuscanyscatours.impl.SCAToursImpl"/>
-  <service name="SCAToursSearch" t:align="top">
-   <t:binding.jsonrpc></t:binding.jsonrpc>
-  </service>
-  <reference name="travelCatalogSearch" target="TravelCatalog/TravelCatalogSearch"/>
-  <reference name="tripBooking" target="TripBooking"/>
-  <reference name="cartCheckout" target="ShoppingCart/CartCheckout"/>
- </component>
- <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" requires="authentication"/>
-   <binding.sca></binding.sca>
-  </service>
- </component>
- <component name="CurrencyConverter">
-  <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>
-  <service name="CurrencyConverter"/>
- </component>
- <component name="HotelPartner" t:color="orange1">
-  <implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
-  <service name="Search">
-   <binding.ws name="searchws" uri="http://localhost:8086/Hotel/Search"/>
-   <callback>
-    <binding.ws></binding.ws>
-   </callback>
-  </service>
-  <service name="Book"/>
- </component>
- <component name="FlightPartner" t:color="orange1">
-  <implementation.java class="com.tuscanyscatours.flight.impl.FlightImpl"/>
-  <service name="Search">
-   <interface.java interface="com.tuscanyscatours.common.Search" callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
-   <binding.ws name="searchws" uri="http://localhost:8086/Flight/Search"/>
-   <t:binding.jsonrpc name="searchjsonrpc"/>
-   <callback>
-    <binding.ws></binding.ws>
-   </callback>
-  </service>
-  <service name="Book"/>
- </component>
- <component name="CarPartner" t:color="orange1">
-  <implementation.java class="com.tuscanyscatours.car.impl.CarImpl"/>
-  <service name="Search">
-   <binding.ws name="searchws" uri="http://localhost:8086/Car/Search"/>
-   <t:binding.jsonrpc name="searchjsonrpc"/>
-   <callback>
-    <binding.ws></binding.ws>
-   </callback>
-  </service>
-  <service name="Book"/>
- </component>
- <component name="TravelCatalog">
-  <implementation.java class="com.tuscanyscatours.travelcatalog.impl.TravelCatalogImpl"/>
-  <service name="TravelCatalogSearch"/>
-  <reference name="hotelSearch" target="HotelSearch">
-   <binding.ws uri="http://localhost:8086/Hotel/Search"/>
-   <callback>
-    <binding.ws name="callback" uri="http://localhost:8084/Hotel/SearchCallback"/>
-   </callback>
-  </reference>
-  <reference name="flightSearch" target="FlightSearch">
-   <interface.java interface="com.tuscanyscatours.common.Search" callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
-   <binding.ws uri="http://localhost:8086/Flight/Search"/>
-   <callback>
-    <binding.ws name="callback" uri="http://localhost:8084/Flight/SearchCallback"/>
-   </callback>
-  </reference>
-  <reference name="carSearch" target="CarSearch">
-   <binding.ws uri="http://localhost:8086/Car/Search"/>
-   <callback>
-    <binding.ws name="callback" uri="http://localhost:8084/Car/SearchCallback"/>
-   </callback>
-  </reference>
-  <reference name="tripSearch" target="TripSearch">
-   <binding.ws uri="http://localhost:8085/Trip/Search"/>
-   <callback>
-    <binding.ws name="callback" uri="http://localhost:8084/Trip/SearchCallback"/>
-   </callback>
-  </reference>
-  <reference name="currencyConverter" target="CurrencyConverter"/>
-  <property>GBP</property>
- </component>
- <component name="TripBooking">
-  <implementation.java class="com.tuscanyscatours.tripbooking.impl.TripBookingImpl"/>
-  <service name="TripBooking"/>
-  <reference name="hotelBook" target="HotelPartner/Book"/>
-  <reference name="flightBook" target="FlightPartner/Book"/>
-  <reference name="carBook" target="CarPartner/Book"/>
-  <reference name="tripBook" target="TripPartner/Book"/>
-  <reference name="cartUpdates" target="ShoppingCart/CartUpdates"/>
- </component>
- <component name="TripPartner" t:color="orange1">
-  <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl"/>
-  <service name="Search">
-   <binding.ws name="searchws" uri="http://localhost:8085/Trip/Search"/>
-   <t:binding.jsonrpc name="searchjsonrpc"/>
-   <callback>
-    <binding.ws></binding.ws>
-   </callback>
-  </service>
-  <service name="Book"/>
- </component>
- <component name="ShoppingCart">
-  <implementation.java class="com.tuscanyscatours.shoppingcart.impl.ShoppingCartImpl"/>
-  <reference name="cartStore" target="CartStore" t:align="bottom"/>
-  <reference name="payment" target="Payment">
-   <binding.ws uri="http://localhost:8081/Payment"/>
-  </reference>
- </component>
- <component name="CartStore" t:color="yellow1">
-  <service name="CartStore" t:align="top"/>
-  <implementation.java class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/>
- </component>
- <component name="Payment">
-  <implementation.spring location="Payment-context.xml"/>
-  <service name="Payment">
-   <binding.ws uri="http://localhost:8081/Payment"/>
-  </service>
-  <reference name="creditCardPaymentReference" target="CreditCardPayment">
-   <binding.ws uri="http://localhost:8082/CreditCardPayment" requires="authentication"/>
-  </reference>
-  <reference name="emailGateway" target="EmailGateway"/>
-  <reference name="customerRegistry" target="CustomerRegistry"/>
-  <property>1.23</property>
- </component>
- <component name="CustomerRegistry">
-  <implementation.java class="com.tuscanyscatours.customer.impl.CustomerRegistryImpl"/>
- </component>
- <component name="EmailGateway">
-  <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl"/>
- </component>
- <component name="HotelSearch" t:color="red1">
-  <service name="HotelSearch"/>
-  <implementation.java class="com.tuscanyscatours.PlaceHolderImpl"/>
- </component>
- <component name="FlightSearch" t:color="red1">
-  <service name="FlightSearch"/>
-  <implementation.java class="com.tuscanyscatours.PlaceHolderImpl"/>
- </component>
- <component name="CarSearch" t:color="red1">
-  <service name="CarSearch"/>
-  <implementation.java class="com.tuscanyscatours.PlaceHolderImpl"/>
- </component>
- <component name="TripSearch" t:color="red1">
-  <service name="TripSearch"/>
-  <implementation.java class="com.tuscanyscatours.PlaceHolderImpl"/>
- </component>
-</composite>
diff --git a/sca-cpp/trunk/modules/edit/apps/travel/app.html b/sca-cpp/trunk/modules/edit/apps/travel/app.html
deleted file mode 100644
index ff320ac5b0..0000000000
--- a/sca-cpp/trunk/modules/edit/apps/travel/app.html
+++ /dev/null
@@ -1,27 +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.    
--->
-<DIV id="page">
- <SPAN id="header" class="h1" style="position: absolute; top: 0px; left: 0px; ">
-  <H1>Welcome to SCATours Online Travel</H1>
- </SPAN>
- <SPAN id="book" class="button" style="position: absolute; top: 60px; left: 0px; ">
-  <INPUT type="button" value="Book a Trip"/>
- </SPAN>
-</DIV>