Bring up the test cases

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

4 files changed, 8 insertions, 71 deletions

diff --git a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index 31731a79d7..0e834dc1c3 100644
--- a/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
@@ -103,12 +103,11 @@ public class OSGiReadImplTestCase extends TestCase {
             "<?xml version=\"1.0\" encoding=\"ASCII\"?>" + "<implementation.osgi xmlns=\"http://tuscany.apache.org/xmlns/sca/1.1\" targetNamespace=\"http://osgi\" "
                 + "bundleSymbolicName=\"OSGiTestService\" "
                 + "bundleVersion=\"2.0.0\" "
-                + "imports=\"import1.jar import2.jar\""
                 + "/>";
         ByteArrayInputStream is = new ByteArrayInputStream(str.getBytes());
 
         XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-        reader.next();
+        reader.nextTag();
 
         OSGiImplementation osgiImpl = (OSGiImplementation)staxProcessor.read(reader);
 
diff --git a/java/sca/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/java/sca/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
deleted file mode 100644
index 7b790d9eed..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
+++ /dev/null
@@ -1,28 +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.    
--->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <service name="OSGiTestService">
-        <interface.java interface="org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface"/>
-    </service>
-    
-    <property name="currency" type="xsd:string" >GBP</property> 
-    <property name="exchangeRate" type="xsd:double" >1.0</property> 
-    
-</componentType>
diff --git a/java/sca/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/java/sca/modules/implementation-osgi/src/test/resources/osgiproptest.composite
deleted file mode 100644
index ac94b71088..0000000000
--- a/java/sca/modules/implementation-osgi/src/test/resources/osgiproptest.composite
+++ /dev/null
@@ -1,32 +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.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test" name="OSGiTestComposite">

-

-    <component name="OSGiTestServiceComponent">

-        <tuscany:implementation.osgi bundle="OSGiTestService"

-            bundleSymbolicName="org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface" />

-

-        <property name="currency" type="xsd:string">USD</property>

-        <property name="exchangeRate" type="xsd:double">2.0</property>

-

-    </component>

-

-</composite>

diff --git a/java/sca/modules/implementation-osgi/src/test/resources/osgitest.composite b/java/sca/modules/implementation-osgi/src/test/resources/osgitest.composite
index 8bafd4a2c9..c5f0f27560 100644
--- a/java/sca/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/java/sca/modules/implementation-osgi/src/test/resources/osgitest.composite
@@ -20,18 +20,16 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

            xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-           tagetNamespace="http://test"

+           targetNamespace="http://test"

            name="OSGiTestComposite">

 

     <component name="OSGiTestServiceComponent">

-        <tuscany:implementation.osgi 

-            bundle="OSGiTestService" 

-            bundleSymbolicName="org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface"

-        />

-        

-        <property name="currency" type="xsd:string" >USD</property> 

-        <property name="exchangeRate" type="xsd:double" >2.0</property> 

-            

+        <tuscany:implementation.osgi bundle="OSGiTestService"

+            bundleSymbolicName="org.apache.tuscany.sca.implementation.osgi.test.OSGiTestInterface" />

+

+        <property name="currency" type="xsd:string">USD</property>

+        <property name="exchangeRate" type="xsd:double">2.0</property>

+

     </component>

 

 </composite>