5 files changed, 8 insertions, 16 deletions
diff --git a/sca-cpp/trunk/test/store-cpp/store.composite b/sca-cpp/trunk/test/store-cpp/store.composite
index 3839a8b816..056f7b4c68 100644
--- a/sca-cpp/trunk/test/store-cpp/store.composite
+++ b/sca-cpp/trunk/test/store-cpp/store.composite
@@ -50,7 +50,7 @@
     </component>     
 
     <component name="Cache">
-        <implementation.cpp path="../../components/cache/.libs" library="libmcache"/>
+        <implementation.cpp path="../../components/cache/.libs" library="libmemcache"/>
         <service name="Cache">
             <t:binding.atom uri="cache"/>
         </service>
diff --git a/sca-cpp/trunk/test/store-java/store.composite b/sca-cpp/trunk/test/store-java/store.composite
index 5024d79ee6..8d733db134 100644
--- a/sca-cpp/trunk/test/store-java/store.composite
+++ b/sca-cpp/trunk/test/store-java/store.composite
@@ -50,7 +50,7 @@
     </component>     
 
     <component name="Cache">
-        <implementation.cpp path="../../components/cache/.libs" library="libmcache"/>
+        <implementation.cpp path="../../components/cache/.libs" library="libmemcache"/>
         <service name="Cache">
             <t:binding.atom uri="cache"/>
         </service>
diff --git a/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java b/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java
index 6620cbbbb0..878e0cff49 100644
--- a/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java
+++ b/sca-cpp/trunk/test/store-java/store/ShoppingCartImpl.java
@@ -14,14 +14,13 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package store;
 
 import static org.apache.tuscany.IterableUtil.*;
-
-import java.util.UUID;
+import static org.apache.tuscany.UUIDUtil.*;
 
 import org.apache.tuscany.Service;
 
@@ -44,17 +43,10 @@ public class ShoppingCartImpl {
     }
 
     /**
-     * Returns a UUID.
-     */
-    String uuid() {
-        return UUID.randomUUID().toString();
-    }
-
-    /**
      * Post a new item to the cart. Create a new cart if necessary.
      */
     public Iterable<String> post(final Iterable<String> collection, final Iterable<?> item, final Service cache) {
-        final String id = this.uuid();
+        final String id = uuid();
         final Iterable<?> newItem = list(car(item), id, caddr(item));
         final Iterable<?> cart = cons(newItem, this.getcart(cartId, cache));
         final Iterable<String> iid = list(cartId);
@@ -65,7 +57,7 @@ public class ShoppingCartImpl {
     /**
      * Find an item in the cart.
      */
-    public Iterable<?> find(final String id, final Iterable<?> cart) {
+    Iterable<?> find(final String id, final Iterable<?> cart) {
         if(isNil(cart))
             return cons("Item", list("0", list()));
         if(id.equals(cadr(car(cart))))
diff --git a/sca-cpp/trunk/test/store-python/store.composite b/sca-cpp/trunk/test/store-python/store.composite
index 8dc9950204..889f514624 100644
--- a/sca-cpp/trunk/test/store-python/store.composite
+++ b/sca-cpp/trunk/test/store-python/store.composite
@@ -60,7 +60,7 @@
     </component>     
 
     <component name="Cache">
-        <implementation.cpp path="../../components/cache/.libs" library="libmcache"/>
+        <implementation.cpp path="../../components/cache/.libs" library="libmemcache"/>
         <service name="Cache">
             <t:binding.atom uri="cache"/>
         </service>
diff --git a/sca-cpp/trunk/test/store-scheme/store.composite b/sca-cpp/trunk/test/store-scheme/store.composite
index 94e066acad..36b155b595 100644
--- a/sca-cpp/trunk/test/store-scheme/store.composite
+++ b/sca-cpp/trunk/test/store-scheme/store.composite
@@ -60,7 +60,7 @@
     </component>     
 
     <component name="Cache">
-        <implementation.cpp path="../../components/cache/.libs" library="libmcache"/>
+        <implementation.cpp path="../../components/cache/.libs" library="libmemcache"/>
         <service name="Cache">
             <t:binding.atom uri="cache"/>
         </service>