Update to the latest version of OSGi enterprise draft specs

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

1 files changed, 26 insertions, 24 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java b/sca-java-2.x/trunk/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
index cef99f5625..0e7acc354a 100644
--- a/sca-java-2.x/trunk/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
+++ b/sca-java-2.x/trunk/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
@@ -41,32 +41,34 @@ import org.junit.Test;
  */
 public class ServiceDescriptionsTestCase {
     private static final String xml =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" 
-            + "<service-descriptions xmlns=\"http://www.osgi.org/xmlns/sd/v1.0.0\" "
+        "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<endpoint-descriptions xmlns=\"http://www.osgi.org/xmlns/rsa/v1.0.0\" "
             + "xmlns:sca=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\">"
-            + "<service-description>"
-            + "<provide interface=\"calculator.operations.AddService\"/>"
-            + "<property name=\"service.intents\">sca:SOAP sca:HTTP</property>"
-            + "<property name=\"osgi.remote.configuration.type\">sca</property>"
-            + "<property name=\"osgi.remote.configuration.sca.componentType\">"
-            + "OSGI-INF/sca/bundle.componentType"
+            + "<endpoint-description>"
+            + "<property name=\"objectClass\" value=\"calculator.operations.AddService\"/>"
+            + "<property name=\"service.intents\" value=\"sca:SOAP sca:HTTP\"/>"
+            + "<property name=\"service.imported.configs\" value=\"org.osgi.sca\"/>"
+            + "</endpoint-description>"
+            + "<endpoint-description>"
+            + "<property name=\"service.intents\">"
+            + "    <list>"
+            + "        <value>SOAP</value>"
+            + "        <value>HTTP</value>"
+            + "    </list>"
             + "</property>"
-            + "<property name=\"osgi.remote.configuration.sca.reference\">"
-            + "addService"
-            + "</property>"
-            + "</service-description>"
-            + "<service-description>"
-            + "<provide interface=\"calculator.operations.SubtractService\"/>"
-            + "<property name=\"service.intents\">sca:SOAP sca:HTTP</property>"
-            + "<property name=\"osgi.remote.configuration.type\">sca</property>"
-            + "<property name=\"osgi.remote.configuration.sca.componentType\">"
-            + "OSGI-INF/sca/bundle.componentType"
-            + "</property>"
-            + "<property name=\"osgi.remote.configuration.sca.reference\">"
-            + "subtractService"
-            + "</property>"
-            + "</service-description>"
-            + "</service-descriptions>";
+            + "<property name=\"endpoint.id\" value=\"http://ws.acme.com:9000/hello\"/>"
+            + "<property name=\"objectClass\" value=\"com.acme.Foo\"/>"
+            + "<property name=\"endpoint.package.version.com.acme\" value=\"4.2\"/>"
+            + "<property name=\"service.imported.configs\" value=\"com.acme\"/>"
+            + "<property name=\"com.acme.ws.xml\">"
+            + "<xml>"
+            + "              <config xmlns=\"http://acme.com/defs\">"
+            + "                  <port>1029</port>"
+            + "              <host>www.acme.com</host>"
+            + "          </config>"
+            + "      </xml>"
+            + "  </property>"
+            + "</endpoint-description>"
+            + "</endpoint-descriptions>";
 
     private static ServiceDescriptionsProcessor processor;
     private static XMLStreamReader reader;