From 15cb80cb8e53910e05f6d6f6d8ed4536eb335eba Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 16 Mar 2009 23:17:35 +0000
Subject: Add missing composites and use SCA-Composite header

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@755037 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java    | 3 ++-
 .../src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF      | 1 +
 .../resources/calculator/dosgi/operations/META-INF/MANIFEST.MF    | 1 +
 .../resources/calculator/dosgi/operations/operations.composite    | 8 --------
 4 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'java/sca/modules/implementation-osgi-runtime/src')

diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 1dee0b1ae7..04341bcd3f 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/java/sca/modules/implementation-osgi-runtime/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
@@ -102,7 +102,8 @@ public class CalculatorOSGiNodeTestCase {
                                                      new String[] {"OSGI-INF/add-component.xml",
                                                                    "OSGI-INF/subtract-component.xml",
                                                                    "OSGI-INF/multiply-component.xml",
-                                                                   "OSGI-INF/divide-component.xml"},
+                                                                   "OSGI-INF/divide-component.xml",
+                                                                   "calculator/dosgi/operations/operations.composite"},
                                                      OperationsActivator.class,
                                                      AddService.class,
                                                      AddServiceImpl.class,
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
index f0f640541f..5973372d7c 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@ Eclipse-LazyStart: true
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-DocURL: http://www.apache.org/
 Service-Component: OSGI-INF/calculator-component.xml
+SCA-Composite: calculator/dosgi/calculator.composite
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
index 2dbead0b88..d353e7edb6 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
+++ b/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Service-Component: OSGI-INF/add-component.xml,
  OSGI-INF/subtract-component.xml,
  OSGI-INF/multiply-component.xml,
  OSGI-INF/divide-component.xml
+SCA-Composite: calculator/dosgi/operations/operations.composite
diff --git a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/operations.composite b/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/operations.composite
index 14c2b6a4e4..964be5643e 100644
--- a/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/operations.composite
+++ b/java/sca/modules/implementation-osgi-runtime/src/test/resources/calculator/dosgi/operations/operations.composite
@@ -25,14 +25,6 @@
 
     <component name="OperationsComponent">
         <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi.operations" bundleVersion="1.0.0" />
-        <service name="AddService">
-        </service>
-        <service name="SubtractService">
-        </service>
-        <service name="MultiplyService">
-        </service>
-        <service name="DivideService">
-        </service>
     </component>
 
 </composite>
-- 
cgit v1.2.3