diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-16 06:50:41 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-16 06:50:41 +0000 |
| commit | ce9150bd4c4880a4032030213de8626c21764bfd (patch) | |
| tree | 92b1274bde46928417d17868b504c365382da4b0 /java/sca/samples | |
| parent | 41f8541059c72bd6724cb852abd42bc1d98a2f53 (diff) | |
Update to Equinox 3.5 to take advantage of the hook services API
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@794552 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
5 files changed, 38 insertions, 8 deletions
diff --git a/java/sca/samples/dosgi-calculator-operations/pom.xml b/java/sca/samples/dosgi-calculator-operations/pom.xml index fd08e25e72..add9380c55 100644 --- a/java/sca/samples/dosgi-calculator-operations/pom.xml +++ b/java/sca/samples/dosgi-calculator-operations/pom.xml @@ -54,7 +54,7 @@ <dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>services</artifactId>
- <version>3.1.200-v20071203</version>
+ <version>3.2.0-v20090520-1800</version>
<scope>test</scope>
</dependency>
@@ -62,14 +62,14 @@ <dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>ds</artifactId>
- <version>1.0.0-v20080427-0830</version>
+ <version>1.1.0-v20090601</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>util</artifactId>
- <version>1.0.0-v20080414</version>
+ <version>1.0.100-v20090520-1800</version>
<scope>test</scope>
</dependency>
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 new file mode 100644 index 0000000000..65a5a76194 --- /dev/null +++ b/java/sca/samples/dosgi-calculator/OSGI-INF/sca/calculator-service.bindings @@ -0,0 +1,24 @@ +<?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.
+-->
+<!-- A consumer-side service description file for RFC 119 -->
+<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 diff --git a/java/sca/samples/dosgi-calculator/pom.xml b/java/sca/samples/dosgi-calculator/pom.xml index 2033338434..115dd15003 100644 --- a/java/sca/samples/dosgi-calculator/pom.xml +++ b/java/sca/samples/dosgi-calculator/pom.xml @@ -60,7 +60,7 @@ <dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>services</artifactId>
- <version>3.1.200-v20071203</version>
+ <version>3.2.0-v20090520-1800</version>
</dependency>
<dependency>
@@ -74,14 +74,14 @@ <dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>ds</artifactId>
- <version>1.0.0-v20080427-0830</version>
+ <version>1.1.0-v20090601</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>util</artifactId>
- <version>1.0.0-v20080414</version>
+ <version>1.0.100-v20090520-1800</version>
<scope>test</scope>
</dependency>
diff --git a/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java index ac49cbcb12..8bfa6772da 100644 --- a/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java +++ b/java/sca/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java @@ -59,6 +59,9 @@ public class CalculatorActivator implements BundleActivator { Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put("sca.service", "CalculatorComponent#service-name(Calculator)");
props.put("calculator", "Calculator");
+ props.put("osgi.remote.configuration.type", "sca");
+ props.put("osgi.remote.configuration.sca.bindings", new String[] {"OSGI-INF/sca/calculator-service.bindings"});
+ props.put("osgi.remote.interfaces", new String[] {"*"});
logger.info("Registering " + CalculatorService.class.getName());
CalculatorService calculator = new CalculatorServiceImpl(context);
context.registerService(CalculatorService.class.getName(), calculator, props);
diff --git a/java/sca/samples/pom.xml b/java/sca/samples/pom.xml index 36e0049d60..55582f903a 100644 --- a/java/sca/samples/pom.xml +++ b/java/sca/samples/pom.xml @@ -56,13 +56,16 @@ <module>implementation-java-calculator</module> <module>binding-ws-calculator</module> - <!-- module>host-webapp-calculator</module --> <module>webapps/helloworld</module> <module>webapps/helloworld-bpel</module> <module>webapps/helloworld-jsp</module> <module>webapps/helloworld-stripes</module> - + <module>webapps/helloworld-servlet</module> +<!-- + <module>webapps/helloworld-rest</module> + <module>webapps/helloworld-wicket</module> +--> </modules> </profile> </profiles> |