Author: slaws
Date: Sun Oct 11 11:58:29 2009
New Revision: 824057
URL: http://svn.apache.org/viewvc?rev=824057&view=rev
Log:
Separate the ShoppingCart interface into multiple separate interfaces to better
match the "introducing" scenario
Added:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
(with props)
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
(with props)
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
(with props)
Removed:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/ShoppingCart.java
Modified:
tuscany/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
tuscany/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
Modified:
tuscany/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite?rev=824057&r1=824056&r2=824057&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-frontend/src/main/resources/scatours.composite
Sun Oct 11 11:58:29 2009
@@ -66,7 +66,7 @@
<reference name="flightBook" target="Trip/Book"/>
<reference name="carBook" target="Car/Book"/>
<reference name="tripBook" target="Trip/Book"/>
- <reference name="shoppingCart" target="ShoppingCart"/>
+ <reference name="cartUpdates" target="ShoppingCart/CartUpdates"/>
</component>
</composite>
Modified:
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite?rev=824057&r1=824056&r2=824057&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-shoppingcart/src/main/resources/scatours.composite
Sun Oct 11 11:58:29 2009
@@ -23,7 +23,6 @@
<component name="ShoppingCart">
<implementation.java
class="com.tuscanyscatours.shoppingcart.impl.ShoppingCartImpl"/>
- <service name="ShoppingCart"/>
<reference name="cartStore" target="CartStore"/>
<reference name="payment">
<binding.ws uri="http://localhost:8081/Payment"; />
@@ -32,7 +31,6 @@
<component name="CartStore">
<implementation.java
class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/>
- <service name="CartStore"/>
</component>
</composite>
Modified:
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite?rev=824057&r1=824056&r2=824057&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
(original)
+++
tuscany/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
Sun Oct 11 11:58:29 2009
@@ -51,7 +51,8 @@
</service>
<reference name="travelCatalogSearch"
target="TravelCatalog/TravelCatalogSearch"/>
<reference name="tripBooking" target="TripBooking"/>
- <reference name="shoppingCart" target="ShoppingCart"/>
+ <reference name="cartInitialize"
target="ShoppingCart/CartInitialize"/>
+ <reference name="cartCheckout" target="ShoppingCart/CartCheckout"/>
</component>
</composite>
Modified:
tuscany/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java?rev=824057&r1=824056&r2=824057&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
(original)
+++
tuscany/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
Sun Oct 11 11:58:29 2009
@@ -18,13 +18,6 @@
*/
package com.tuscanyscatours.impl;
-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.Scope;
import org.osoa.sca.annotations.Service;
@@ -34,7 +27,8 @@
import com.tuscanyscatours.SCAToursSearch;
import com.tuscanyscatours.common.TripItem;
import com.tuscanyscatours.common.TripLeg;
-import com.tuscanyscatours.shoppingcart.ShoppingCart;
+import com.tuscanyscatours.shoppingcart.CartCheckout;
+import com.tuscanyscatours.shoppingcart.CartInitialize;
import com.tuscanyscatours.travelcatalog.TravelCatalogSearch;
import com.tuscanyscatours.tripbooking.TripBooking;
@@ -53,7 +47,10 @@
protected TripBooking tripBooking;
@Reference
- protected ShoppingCart shoppingCart;
+ protected CartInitialize cartInitialize;
+
+ @Reference
+ protected CartCheckout cartCheckout;
// SCAToursSearch methods
@@ -71,17 +68,17 @@
// SCAToursCart methods
public String newCart(){
- String cartId = shoppingCart.newCart();
+ String cartId = cartInitialize.newCart();
return cartId;
}
public TripItem[] getTrips(String cartId){
- return shoppingCart.getTrips(cartId);
+ return cartInitialize.getTrips(cartId);
}
public void checkout(String cartId){
// need to get the user id from the context here but
// just make one up for the time being
- shoppingCart.checkout(cartId, "c-0");
+ cartCheckout.checkout(cartId, "c-0");
}
}
Added:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java?rev=824057&view=auto
==============================================================================
---
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
(added)
+++
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
Sun Oct 11 11:58:29 2009
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.tuscanyscatours.shoppingcart;
+
+import org.osoa.sca.annotations.Remotable;
+
+...@remotable
+public interface CartCheckout {
+ void checkout(String cartId,String name);
+}
Propchange:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java?rev=824057&view=auto
==============================================================================
---
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
(added)
+++
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
Sun Oct 11 11:58:29 2009
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.tuscanyscatours.shoppingcart;
+
+import org.osoa.sca.annotations.Remotable;
+
+import com.tuscanyscatours.common.TripItem;
+
+...@remotable
+public interface CartInitialize {
+ String newCart();
+ TripItem[] getTrips(String cartId);
+}
Propchange:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java?rev=824057&view=auto
==============================================================================
---
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
(added)
+++
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
Sun Oct 11 11:58:29 2009
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.tuscanyscatours.shoppingcart;
+
+import org.osoa.sca.annotations.Remotable;
+
+import com.tuscanyscatours.common.TripItem;
+
+...@remotable
+public interface CartUpdates {
+ void addTrip(String cartId,TripItem trip);
+ void removeTrip(String cartId,TripItem trip);
+}
Propchange:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java?rev=824057&r1=824056&r2=824057&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
(original)
+++
tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
Sun Oct 11 11:58:29 2009
@@ -18,32 +18,28 @@
*/
package com.tuscanyscatours.shoppingcart.impl;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
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.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
import com.tuscanyscatours.common.TripItem;
import com.tuscanyscatours.payment.Payment;
+import com.tuscanyscatours.shoppingcart.CartInitialize;
import com.tuscanyscatours.shoppingcart.CartStore;
-import com.tuscanyscatours.shoppingcart.ShoppingCart;
+import com.tuscanyscatours.shoppingcart.CartCheckout;
+import com.tuscanyscatours.shoppingcart.CartUpdates;
/**
* An implementation of the ShoppingCart service
*/
-...@service(interfaces={ShoppingCart.class})
-public class ShoppingCartImpl implements ShoppingCart{
+...@service(interfaces={CartInitialize.class, CartUpdates.class,
CartCheckout.class})
+public class ShoppingCartImpl implements CartInitialize, CartUpdates,
CartCheckout{
@Reference
protected Payment payment;
Modified:
tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java?rev=824057&r1=824056&r2=824057&view=diff
==============================================================================
---
tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
(original)
+++
tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
Sun Oct 11 11:58:29 2009
@@ -26,7 +26,7 @@
import com.tuscanyscatours.common.Book;
import com.tuscanyscatours.common.TripItem;
-import com.tuscanyscatours.shoppingcart.ShoppingCart;
+import com.tuscanyscatours.shoppingcart.CartUpdates;
import com.tuscanyscatours.tripbooking.TripBooking;
/**
@@ -48,7 +48,7 @@
protected Book tripBook;
@Reference
- protected ShoppingCart shoppingCart;
+ protected CartUpdates cartUpdates;
@Context
protected ComponentContext componentContext;
@@ -81,8 +81,8 @@
}
// add trip to the shopping cart
- ServiceReference<ShoppingCart> cart =
componentContext.getServiceReference(ShoppingCart.class,
-
"shoppingCart");
+ ServiceReference<CartUpdates> cart =
componentContext.getServiceReference(CartUpdates.class,
+
"cartUpdates");
cart.setConversationID(cartId);
cart.getService().addTrip(cartId, trip);
