Disable the OSGi DS to avoid conflicts

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

3 files changed, 2 insertions, 26 deletions

diff --git a/java/sca/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF b/java/sca/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 5d2426e591..82a803e3a6 100644
--- a/java/sca/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/java/sca/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true

 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-DocURL: http://www.apache.org/

-Service-Component: OSGI-INF/add-component.xml,

+Service-Component-Disabled: OSGI-INF/add-component.xml,

  OSGI-INF/subtract-component.xml,

  OSGI-INF/multiply-component.xml,

  OSGI-INF/divide-component.xml

diff --git a/java/sca/samples/dosgi-calculator/META-INF/MANIFEST.MF b/java/sca/samples/dosgi-calculator/META-INF/MANIFEST.MF
index 4b7b7ec71b..542b53b085 100644
--- a/java/sca/samples/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/java/sca/samples/dosgi-calculator/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@ Bundle-ActivationPolicy: lazy
 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

+Service-Component-Disabled: OSGI-INF/calculator-component.xml

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/samples/dosgi-calculator/OSGI-INF/sca/calculator-service.bindings b/java/sca/samples/dosgi-calculator/OSGI-INF/sca/calculator-service.bindings
deleted file mode 100644
index 90e55f7377..0000000000
--- a/java/sca/samples/dosgi-calculator/OSGI-INF/sca/calculator-service.bindings
+++ /dev/null
@@ -1,24 +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.

--->

-<!-- SCA bindings for calculator service -->

-<bindings xmlns="http://www.osgi.org/xmlns/sd/v1.0.0" 

-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903">

-    <sca:binding.ws uri="http://localhost:8086/CalculatorService"/>

-</bindings>    
\ No newline at end of file