From 6b4bc0c967a75cb4e57240dad2972cf6800d0ecd Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 29 May 2009 18:20:02 +0000
Subject: Update the test scenarios

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@780056 13f79535-47bb-0310-9956-ffa450edef68
---
 .../impl/CreditCardPaymentActivator.java           |  2 +-
 .../creditcard/impl/CreditCardPaymentImpl.java     |  1 +
 .../main/resources/META-INF/sca-contribution.xml   | 22 ----------------------
 .../resources/OSGI-INF/sca/bundle.componentType    |  5 +----
 .../main/resources/OSGI-INF/sca/bundle.composite   |  3 +++
 5 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/META-INF/sca-contribution.xml

(limited to 'sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src')

diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java
index ba09b15de4..9c7364d4d5 100644
--- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java
+++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentActivator.java
@@ -30,7 +30,7 @@ import scatours.payment.creditcard.CreditCardPayment;
 public class CreditCardPaymentActivator implements BundleActivator {
 
     public void start(BundleContext context) throws Exception {
-        System.out.println("Registering CreditCardPayment service...");
+        System.out.println("[" + context.getBundle().getSymbolicName() + "]: Registering CreditCardPayment service...");
         context.registerService(CreditCardPayment.class.getName(), new CreditCardPaymentImpl(context), null);
     }
 
diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java
index 591e02e31b..54a6f722de 100644
--- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/java/scatours/payment/creditcard/impl/CreditCardPaymentImpl.java
@@ -76,6 +76,7 @@ public class CreditCardPaymentImpl implements CreditCardPayment {
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         context.createMarshaller().marshal(element, writer);
         writer.flush();
+        System.out.println("[CreditCard]: ");
         System.out.println(writer.toString());
     }
 
diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index f8ce8b7af7..0000000000
--- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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://docs.oasis-open.org/ns/opencsa/sca/200903">
-   <export.java package="payment.creditcard"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType
index 2b006a34b5..847213af37 100644
--- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType
+++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.componentType
@@ -18,15 +18,12 @@
  * under the License.
 -->
 <componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">
+
     <!-- The service elment defines an SCA view of the OSGi service -->
     <service name="CreditCardPayment">
         <!-- The interface will be mapped into the OSGi service class -->
         <interface.java interface="scatours.payment.creditcard.CreditCardPayment"/>
-        <!-- The list of OSGi properties -->
-        <t:osgi.property name="prop1">1</t:osgi.property>
-        <t:osgi.property name="prop2">ABC</t:osgi.property>
     </service>
 
     <!-- The reference elment defines an SCA proxy to a remote OSGi service -->
diff --git a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite
index 97550f027c..0bb37a02e8 100644
--- a/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite
+++ b/sandbox/rfeng/scatours-creditcard-payment-dosgi-contribution/src/main/resources/OSGI-INF/sca/bundle.composite
@@ -33,6 +33,8 @@
         </reference>
     </component>
 
+<!-- Other components can be declared here too -->
+
     <component name="CurrencyConverterComponent">
         <implementation.java class="scatours.currency.impl.CurrencyConverterImpl" />
         <service name="CurrencyConverter">
@@ -40,4 +42,5 @@
         </service>
     </component>
 
+
 </composite>
-- 
cgit v1.2.3