TUSCANY-2629, TUSCANY-2624, TUSCANY-2663 - more changes to record unknown elements that appear in SCDL

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

2 files changed, 48 insertions, 6 deletions

diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 85f6a39243..cb319e2311 100644
--- a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
@@ -22,10 +22,11 @@
 	xmlns:calc="http://calc"
 	targetNamespace="http://calc"

 	name="Calculator">

-

-    <service name="CalculatorService" promote="CalculatorServiceComponent">

+	

+	<service name="CalculatorService" promote="CalculatorServiceComponent">

         <interface.java interface="calculator.CalculatorService"/>

     </service>

+    

     <component name="CalculatorServiceComponent">

 		<implementation.java class="calculator.CalculatorServiceImpl"/>

         <reference name="addService" target="AddServiceComponent"/>

@@ -51,9 +52,8 @@
     </component>

     

     <x:unknownElement uknAttr="attribute1">

-		<x:subUnknownElement1 uknAttr1="attribute1"/>

-		<x:subUnknownElement2/>

+		<y:subUnknownElement1 xmlns:y="http://y" uknAttr1="attribute2"/>

+		<x:subUnknownElement2 />

 	</x:unknownElement>

-

-

+		

 </composite>

diff --git a/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/UnknownElement.composite b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/UnknownElement.composite
new file mode 100644
index 0000000000..f8c0c5ea36
--- /dev/null
+++ b/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/UnknownElement.composite
@@ -0,0 +1,42 @@
+<?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://www.osoa.org/xmlns/sca/1.0" xmlns:ns1="http://temp" xmlns:ns1_1="adfsaf" name="composite1" targetNamespace="http://temp">
+	<unknown>Test unknown</unknown>
+  <component name="data7">
+    <implementation.java class="temp.EchoImpl"/>
+    <unknownImpl abc="cde"/>
+    <service>
+      <interface.wsdl interface="http://echo.webservice#wsdl.interface(Echo)"/>
+    </service>
+  </component>
+</composite>
+
+And I got this:
+<?xml version="1.0" encoding="UTF-8"?>
+<composite targetNamespace="http://temp" name="composite1"
+	xmlns="http://www.osoa.org/xmlns/sca/1.0">
+	<component name="data7">
+		<implementation.java class="temp.EchoImpl"></implementation.java>
+		<service>
+			<interface.wsdl interface="http://echo.webservice#wsdl.interface(Echo)"></interface.wsdl>
+		</service>
+	</component>
+	<component name="empty"></component>
+</composite>