diff options
Diffstat (limited to 'java/sca/samples')
10 files changed, 83 insertions, 154 deletions
diff --git a/java/sca/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF b/java/sca/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF index eab27711b0..cea4e2ff79 100644 --- a/java/sca/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF +++ b/java/sca/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF @@ -20,3 +20,4 @@ Service-Component-Disabled: OSGI-INF/add-component.xml, OSGI-INF/multiply-component.xml,
OSGI-INF/divide-component.xml
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 +SCA-Configuration: OSGI-INF/sca-config/*.xml
diff --git a/java/sca/samples/dosgi-dynamic-calculator/OSGI-INF/sca/calculator-service.bindings b/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml index 90e55f7377..b00f05ad2d 100644 --- a/java/sca/samples/dosgi-dynamic-calculator/OSGI-INF/sca/calculator-service.bindings +++ b/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml @@ -1,24 +1,29 @@ -<?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 +<?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. +--> +<scact:sca-config targetNamespace="http://sample" + xmlns:scact="http://www.osgi.org/xmlns/scact/v1.0.0" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" + xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> + <tuscany:binding.rmi name="Add" uri="rmi://localhost:8085/AddService"/> + <tuscany:binding.rmi name="Divide" uri="rmi://localhost:8085/DivideService"/> + <tuscany:binding.rmi name="Subtract" uri="rmi://localhost:8085/SubtractService"/> + <tuscany:binding.rmi name="Multiply" uri="rmi://localhost:8085/MultiplyService"/> +</scact:sca-config> +
\ No newline at end of file diff --git a/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/divide-service.bindings b/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/divide-service.bindings deleted file mode 100644 index a664456474..0000000000 --- a/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/divide-service.bindings +++ /dev/null @@ -1,23 +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.
--->
-<bindings xmlns="http://www.osgi.org/xmlns/sd/v1.0.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
- <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>
-</bindings>
\ No newline at end of file diff --git a/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/multiply-service.bindings b/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/multiply-service.bindings deleted file mode 100644 index fb1b40e39c..0000000000 --- a/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/multiply-service.bindings +++ /dev/null @@ -1,23 +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.
--->
-<bindings xmlns="http://www.osgi.org/xmlns/sd/v1.0.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
- <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>
-</bindings>
\ No newline at end of file diff --git a/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/subtract-service.bindings b/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/subtract-service.bindings deleted file mode 100644 index 2f44802d1f..0000000000 --- a/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/subtract-service.bindings +++ /dev/null @@ -1,23 +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.
--->
-<bindings xmlns="http://www.osgi.org/xmlns/sd/v1.0.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
- <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>
-</bindings>
\ No newline at end of file diff --git a/java/sca/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/java/sca/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java index 8d4838950b..f75cc6444e 100644 --- a/java/sca/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java +++ b/java/sca/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java @@ -49,22 +49,22 @@ public class OperationsActivator implements BundleActivator { logger.info("Registering " + AddService.class.getName()); props.put("sca.service", "AddComponent#service-name(Add)"); - props.put("sca.bindings", new String[] {"OSGI-INF/sca/add-service.bindings"}); + props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Add"}); context.registerService(AddService.class.getName(), new AddServiceImpl(), props); logger.info("Registering " + SubtractService.class.getName()); props.put("sca.service", "SubtractComponent#service-name(Subtract)"); - props.put("sca.bindings", new String[] {"OSGI-INF/sca/subtract-service.bindings"}); + props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Subtract"}); context.registerService(SubtractService.class.getName(), new SubtractServiceImpl(), props); logger.info("Registering " + MultiplyService.class.getName()); props.put("sca.service", "MultiplyComponent#service-name(Multiply)"); - props.put("sca.bindings", new String[] {"OSGI-INF/sca/multiply-service.bindings"}); + props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Multiply"}); context.registerService(MultiplyService.class.getName(), new MultiplyServiceImpl(), props); logger.info("Registering " + DivideService.class.getName()); props.put("sca.service", "DivideComponent#service-name(Divide)"); - props.put("sca.bindings", new String[] {"OSGI-INF/sca/divide-service.bindings"}); + props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Divide"}); context.registerService(DivideService.class.getName(), new DivideServiceImpl(), props); getBundle(context, AddService.class); diff --git a/java/sca/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF b/java/sca/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF index b1d3beadd6..6ce24a4a32 100644 --- a/java/sca/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF +++ b/java/sca/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF @@ -17,4 +17,7 @@ Eclipse-LazyStart: true Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-DocURL: http://www.apache.org/
Service-Component-Disabled: OSGI-INF/calculator-component.xml
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
+SCA-Configuration: OSGI-INF/sca-config/calculator-config.xml
+Remote-Service: OSGI-INF/remote-service/*.xml
+ diff --git a/java/sca/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/java/sca/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml index 53e83bf72c..ac73ea98f0 100644 --- a/java/sca/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml +++ b/java/sca/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml @@ -24,58 +24,38 @@ <!-- Describe a remote OSGi service --> <service-description> <provide interface="calculator.dosgi.operations.AddService" /> - <property name="service.exported.intents">sca:SOAP sca:HTTP</property> - <property name="service.exported.configs">sca</property> - <property name="sca.componentType"> - OSGI-INF/sca/bundle.componentType - </property> + <property name="remote.exported.intents"></property> + <property name="remote.configs.supported">org.osgi.sca</property> <property name="sca.reference"> addService </property> - <bindings> - <tuscany:binding.rmi uri="rmi://localhost:8085/AddService" /> - </bindings> + <property name="org.osgi.sca.bindings">{http://sample}Add</property> </service-description> <service-description> <provide interface="calculator.dosgi.operations.SubtractService" /> - <property name="service.exported.intents">sca:SOAP sca:HTTP</property> - <property name="service.exported.configs">sca</property> - <property name="sca.componentType"> - OSGI-INF/sca/bundle.componentType - </property> + <property name="remote.exported.intents"></property> + <property name="remote.configs.supported">org.osgi.sca</property> <property name="sca.reference"> subtractService </property> - <bindings> - <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService" /> - </bindings> + <property name="org.osgi.sca.bindings">{http://sample}Subtract</property> </service-description> <service-description> <provide interface="calculator.dosgi.operations.MultiplyService" /> - <property name="service.exported.intents">sca:SOAP sca:HTTP</property> - <property name="service.exported.configs">sca</property> - <property name="sca.componentType"> - OSGI-INF/sca/bundle.componentType - </property> + <property name="remote.exported.intents"></property> + <property name="remote.configs.supported">org.osgi.sca</property> <property name="sca.reference"> multiplyService </property> - <bindings> - <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService" /> - </bindings> + <property name="org.osgi.sca.bindings">{http://sample}Multiply</property> </service-description> <service-description> <provide interface="calculator.dosgi.operations.DivideService" /> - <property name="service.exported.intents">sca:SOAP sca:HTTP</property> - <property name="service.exported.configs">sca</property> - <property name="sca.componentType"> - OSGI-INF/sca/bundle.componentType - </property> + <property name="remote.exported.intents"></property> + <property name="remote.configs.supported">org.osgi.sca</property> <property name="sca.reference"> divideService </property> - <bindings> - <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService" /> - </bindings> + <property name="org.osgi.sca.bindings">{http://sample}Divide</property> </service-description> </service-descriptions>
\ No newline at end of file diff --git a/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/add-service.bindings b/java/sca/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml index d51878c562..878ef9c18e 100644 --- a/java/sca/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca/add-service.bindings +++ b/java/sca/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml @@ -1,23 +1,32 @@ -<?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.
--->
-<bindings xmlns="http://www.osgi.org/xmlns/sd/v1.0.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
- <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>
-</bindings>
\ No newline at end of file +<?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. +--> +<scact:sca-config targetNamespace="http://sample" + xmlns:scact="http://www.osgi.org/xmlns/scact/v1.0.0" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" + xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> + <sca:binding.ws name="Calculator" uri="http://localhost:8086/CalculatorService"/> + + <!-- bindings for the remote services --> + <tuscany:binding.rmi name="Add" uri="rmi://localhost:8085/AddService"/> + <tuscany:binding.rmi name="Divide" uri="rmi://localhost:8085/DivideService"/> + <tuscany:binding.rmi name="Subtract" uri="rmi://localhost:8085/SubtractService"/> + <tuscany:binding.rmi name="Multiply" uri="rmi://localhost:8085/MultiplyService"/> +</scact:sca-config> +
\ No newline at end of file diff --git a/java/sca/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/java/sca/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java index b1d6940943..6228afcd53 100644 --- a/java/sca/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java +++ b/java/sca/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java @@ -60,7 +60,7 @@ public class CalculatorActivator implements BundleActivator { props.put("sca.service", "CalculatorComponent#service-name(Calculator)"); props.put("calculator", "Calculator"); props.put("service.exported.configs", new String[] {"org.osgi.sca"}); - props.put("sca.bindings", new String[] {"OSGI-INF/sca/calculator-service.bindings"}); + props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Calculator"}); props.put("service.exported.interfaces", new String[] {"*"}); logger.info("Registering " + CalculatorService.class.getName()); CalculatorService calculator = new CalculatorServiceImpl(context); |