Fix svn:eol-style and svn:keywords properties for java/xml files

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

6 files changed, 291 insertions, 291 deletions

diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
index 7860094626..bc9e4f6aaf 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
@@ -1,54 +1,54 @@
-<?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"

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

-    <!-- The service elment defines an SCA view of the OSGi service -->

-    <service name="Calculator">

-        <!-- The interface will be mapped into the OSGi service class -->

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

-        <!-- The list of OSGi properties -->

-        <t:osgi.property name="prop1">1</t:osgi.property>

-        <t:osgi.property name="prop2">ABC</t:osgi.property>

-    </service>

-    

-    <!-- The reference elment defines an SCA proxy to a remote OSGi service -->

-    <reference name="addService">

-        <interface.java interface="calculator.dosgi.operations.AddService"/>

-        <t:osgi.property name="prop1">1</t:osgi.property>

-        <t:osgi.property name="prop2">ABC</t:osgi.property>

-    </reference>

-    <reference name="subtractService">

-        <interface.java interface="calculator.dosgi.operations.SubtractService"/>

-        <t:osgi.property name="prop1">1</t:osgi.property>

-        <t:osgi.property name="prop2">ABC</t:osgi.property>

-    </reference>

-    <reference name="multiplyService">

-        <interface.java interface="calculator.dosgi.operations.MultiplyService"/>

-        <t:osgi.property name="prop1">1</t:osgi.property>

-        <t:osgi.property name="prop2">ABC</t:osgi.property>

-    </reference>

-    <reference name="divideService">

-        <interface.java interface="calculator.dosgi.operations.DivideService"/>

-        <t:osgi.property name="prop1">1</t:osgi.property>

-        <t:osgi.property name="prop2">ABC</t:osgi.property>

-    </reference>

-    

-</componentType>

+<?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"
+               xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">
+    <!-- The service elment defines an SCA view of the OSGi service -->
+    <service name="Calculator">
+        <!-- The interface will be mapped into the OSGi service class -->
+        <interface.java interface="calculator.dosgi.CalculatorService"/>
+        <!-- The list of OSGi properties -->
+        <t:osgi.property name="prop1">1</t:osgi.property>
+        <t:osgi.property name="prop2">ABC</t:osgi.property>
+    </service>
+    
+    <!-- The reference elment defines an SCA proxy to a remote OSGi service -->
+    <reference name="addService">
+        <interface.java interface="calculator.dosgi.operations.AddService"/>
+        <t:osgi.property name="prop1">1</t:osgi.property>
+        <t:osgi.property name="prop2">ABC</t:osgi.property>
+    </reference>
+    <reference name="subtractService">
+        <interface.java interface="calculator.dosgi.operations.SubtractService"/>
+        <t:osgi.property name="prop1">1</t:osgi.property>
+        <t:osgi.property name="prop2">ABC</t:osgi.property>
+    </reference>
+    <reference name="multiplyService">
+        <interface.java interface="calculator.dosgi.operations.MultiplyService"/>
+        <t:osgi.property name="prop1">1</t:osgi.property>
+        <t:osgi.property name="prop2">ABC</t:osgi.property>
+    </reference>
+    <reference name="divideService">
+        <interface.java interface="calculator.dosgi.operations.DivideService"/>
+        <t:osgi.property name="prop1">1</t:osgi.property>
+        <t:osgi.property name="prop2">ABC</t:osgi.property>
+    </reference>
+    
+</componentType>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
index 3c77086c45..1ae44d0a0b 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
@@ -1,53 +1,53 @@
-<?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://calculator.dosgi" 

-    name="CalculatorComposite">

-

-    <component name="CalculatorComponent">

-        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi" bundleVersion="1.0.0" />

-        <reference name="addService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>

-        </reference>

-        <reference name="subtractService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>

-        </reference>

-        <reference name="multiplyService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>

-        </reference>

-        <reference name="divideService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>

-        </reference>

-        

-        <!-- 

-        <reference name="addService" target="OperationsComponent/AddService">

-        </reference>

-        <reference name="subtractService" target="OperationsComponent/SubtractService">

-        </reference>

-        <reference name="multiplyService" target="OperationsComponent/MultiplyService">

-        </reference>

-        <reference name="divideService" target="OperationsComponent/DivideService">

-        </reference>

-         -->

-    </component>

-

-</composite>

+<?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://calculator.dosgi" 
+    name="CalculatorComposite">
+
+    <component name="CalculatorComponent">
+        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi" bundleVersion="1.0.0" />
+        <reference name="addService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>
+        </reference>
+        <reference name="subtractService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>
+        </reference>
+        <reference name="multiplyService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>
+        </reference>
+        <reference name="divideService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>
+        </reference>
+        
+        <!-- 
+        <reference name="addService" target="OperationsComponent/AddService">
+        </reference>
+        <reference name="subtractService" target="OperationsComponent/SubtractService">
+        </reference>
+        <reference name="multiplyService" target="OperationsComponent/MultiplyService">
+        </reference>
+        <reference name="divideService" target="OperationsComponent/DivideService">
+        </reference>
+         -->
+    </component>
+
+</composite>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
index 6f6f4bdce6..72e2c339f1 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
@@ -1,47 +1,47 @@
-<?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"

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

-

-    

-    <!-- The service elment defines an SCA proxy to a remote OSGi service -->

-    <service name="AddService">

-        <interface.java interface="calculator.dosgi.operations.AddService"/>

-        <t:osgi.property name="prop1">1</t:osgi.property>

-        <t:osgi.property name="prop2">ABC</t:osgi.property>

-    </service>

-    <service name="SubtractService">

-        <interface.java interface="calculator.dosgi.operations.SubtractService"/>

-        <t:osgi.property name="prop1">1</t:osgi.property>

-        <t:osgi.property name="prop2">ABC</t:osgi.property>

-    </service>

-    <service name="MultiplyService">

-        <interface.java interface="calculator.dosgi.operations.MultiplyService"/>

-        <t:osgi.property name="prop1">1</t:osgi.property>

-        <t:osgi.property name="prop2">ABC</t:osgi.property>

-    </service>

-    <service name="DivideService">

-        <interface.java interface="calculator.dosgi.operations.DivideService"/>

-        <t:osgi.property name="prop1">1</t:osgi.property>

-        <t:osgi.property name="prop2">ABC</t:osgi.property>

-    </service>

-    

-</componentType>

+<?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"
+               xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1">
+
+    
+    <!-- The service elment defines an SCA proxy to a remote OSGi service -->
+    <service name="AddService">
+        <interface.java interface="calculator.dosgi.operations.AddService"/>
+        <t:osgi.property name="prop1">1</t:osgi.property>
+        <t:osgi.property name="prop2">ABC</t:osgi.property>
+    </service>
+    <service name="SubtractService">
+        <interface.java interface="calculator.dosgi.operations.SubtractService"/>
+        <t:osgi.property name="prop1">1</t:osgi.property>
+        <t:osgi.property name="prop2">ABC</t:osgi.property>
+    </service>
+    <service name="MultiplyService">
+        <interface.java interface="calculator.dosgi.operations.MultiplyService"/>
+        <t:osgi.property name="prop1">1</t:osgi.property>
+        <t:osgi.property name="prop2">ABC</t:osgi.property>
+    </service>
+    <service name="DivideService">
+        <interface.java interface="calculator.dosgi.operations.DivideService"/>
+        <t:osgi.property name="prop1">1</t:osgi.property>
+        <t:osgi.property name="prop2">ABC</t:osgi.property>
+    </service>
+    
+</componentType>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
index c9fb3818b8..253f7d0df1 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
@@ -1,43 +1,43 @@
-<?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://calculator.dosgi" 

-    name="OperationsComposite">

-

-    <component name="OperationsComponent">

-        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi.operations" bundleVersion="1.0.0" />

-        <service name="AddService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>

-        </service>

-        <service name="SubtractService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>

-        </service>

-        <service name="MultiplyService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>

-        </service>

-        <service name="DivideService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>

-        </service>

-        

-    </component>

-

-</composite>

+<?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://calculator.dosgi" 
+    name="OperationsComposite">
+
+    <component name="OperationsComponent">
+        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi.operations" bundleVersion="1.0.0" />
+        <service name="AddService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>
+        </service>
+        <service name="SubtractService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>
+        </service>
+        <service name="MultiplyService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>
+        </service>
+        <service name="DivideService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>
+        </service>
+        
+    </component>
+
+</composite>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
index 8ba4b85247..b14b3516f6 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
@@ -1,24 +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.    

--->

-

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

-              xmlns:c="http://calculator.dosgi">

-    <deployable composite="c:CalculatorComposite" />

-</contribution>

+<?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.    
+-->
+
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+              xmlns:c="http://calculator.dosgi">
+    <deployable composite="c:CalculatorComposite" />
+</contribution>
diff --git a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
index ac7f0f470c..f48262bdb4 100644
--- a/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
+++ b/java/sca/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
@@ -1,70 +1,70 @@
-<?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://calculator.dosgi" 

-    name="CalculatorComposite">

-

-    <component name="CalculatorComponent">

-        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi" bundleVersion="1.0.0" />

-        <reference name="addService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>

-        </reference>

-        <reference name="subtractService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>

-        </reference>

-        <reference name="multiplyService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>

-        </reference>

-        <reference name="divideService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>

-        </reference>

-        

-        <!-- 

-        <reference name="addService" target="OperationsComponent/AddService">

-        </reference>

-        <reference name="subtractService" target="OperationsComponent/SubtractService">

-        </reference>

-        <reference name="multiplyService" target="OperationsComponent/MultiplyService">

-        </reference>

-        <reference name="divideService" target="OperationsComponent/DivideService">

-        </reference>

-         -->

-         

-    <component name="OperationsComponent">

-        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi.operations" bundleVersion="1.0.0" />

-        <service name="AddService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>

-        </service>

-        <service name="SubtractService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>

-        </service>

-        <service name="MultiplyService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>

-        </service>

-        <service name="DivideService">

-            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>

-        </service>

-        

-    </component>         

-    </component>

-

-</composite>

+<?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://calculator.dosgi" 
+    name="CalculatorComposite">
+
+    <component name="CalculatorComponent">
+        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi" bundleVersion="1.0.0" />
+        <reference name="addService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>
+        </reference>
+        <reference name="subtractService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>
+        </reference>
+        <reference name="multiplyService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>
+        </reference>
+        <reference name="divideService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>
+        </reference>
+        
+        <!-- 
+        <reference name="addService" target="OperationsComponent/AddService">
+        </reference>
+        <reference name="subtractService" target="OperationsComponent/SubtractService">
+        </reference>
+        <reference name="multiplyService" target="OperationsComponent/MultiplyService">
+        </reference>
+        <reference name="divideService" target="OperationsComponent/DivideService">
+        </reference>
+         -->
+         
+    <component name="OperationsComponent">
+        <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi.operations" bundleVersion="1.0.0" />
+        <service name="AddService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/>
+        </service>
+        <service name="SubtractService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/>
+        </service>
+        <service name="MultiplyService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/>
+        </service>
+        <service name="DivideService">
+            <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/>
+        </service>
+        
+    </component>         
+    </component>
+
+</composite>