Start branch for 1.3.1, the only changes in this commit are for the version

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

8 files changed, 294 insertions, 0 deletions

diff --git a/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
@@ -0,0 +1,28 @@
+<?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://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+    <service name="StockQuoteService">

+        <interface.java interface="stockquote.StockQuote"/>

+    </service>

+    

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

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

+    

+</componentType>

diff --git a/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
@@ -0,0 +1,28 @@
+<?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://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+    <service name="StockQuoteService">

+        <interface.java interface="stockquote.StockQuote"/>

+    </service>

+    

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

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

+    

+</componentType>

diff --git a/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
@@ -0,0 +1,28 @@
+<?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://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+    <service name="StockQuoteService">

+        <interface.java interface="stockquote.StockQuote"/>

+    </service>

+    

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

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

+    

+</componentType>

diff --git a/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
new file mode 100644
index 0000000000..5e0965d047
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
@@ -0,0 +1,28 @@
+<?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://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+    <service name="StockQuoteService">

+        <interface.java interface="stockquote.StockQuote"/>

+    </service>

+    

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

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

+    

+</componentType>

diff --git a/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
new file mode 100644
index 0000000000..02ae93aec2
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
@@ -0,0 +1,39 @@
+<?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:xsd="http://www.w3.org/2001/XMLSchema"

+           name="StockQuoteComposite">

+

+    <component name="StockQuoteComponent">

+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

+            bundleSymbolicName="ds.stockquote.StockQuote"

+            classes="stockquote.OSGiStockQuoteComponentImpl">

+            

+            <properties service="StockQuoteService">

+                <property name="service.pid">stockQuote</property>

+            </properties>

+        </implementation.osgi>

+        

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

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

+            

+    </component>

+

+</composite>

diff --git a/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
new file mode 100644
index 0000000000..c94504f07d
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
@@ -0,0 +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.    

+-->

+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 

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

+           name="StockQuoteComposite">

+

+    <component name="USDStockQuoteComponent">

+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

+            bundleSymbolicName="ds.stockquote.StockQuoteFactory"

+            classes="stockquote.OSGiStockQuoteComponentImpl">

+            

+            <properties service="StockQuoteService">

+                <property name="service.pid">stockQuote</property>

+            </properties>

+        </implementation.osgi>

+        

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

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

+            

+    </component>

+    

+     <component name="EUROStockQuoteComponent">

+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

+            bundleSymbolicName="ds.stockquote.StockQuoteFactory"

+            classes="stockquote.OSGiStockQuoteComponentImpl">

+            

+            <properties service="StockQuoteService">

+                <property name="service.pid">stockQuote</property>

+            </properties>

+        </implementation.osgi>

+        

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

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

+            

+    </component>

+

+</composite>

diff --git a/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
new file mode 100644
index 0000000000..fea03404fd
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
@@ -0,0 +1,39 @@
+<?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:xsd="http://www.w3.org/2001/XMLSchema"

+           name="StockQuoteComposite">

+

+    <component name="StockQuoteComponent">

+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

+            bundleSymbolicName="stockquote.StockQuote"

+            classes="stockquote.OSGiStockQuoteImpl">

+            

+            <properties service="StockQuoteService">

+                <property name="service.pid">stockQuote</property>

+            </properties>

+        </implementation.osgi>

+        

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

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

+            

+    </component>

+

+</composite>

diff --git a/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
new file mode 100644
index 0000000000..3c425fcbc9
--- /dev/null
+++ b/branches/sca-java-1.3.1/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
@@ -0,0 +1,50 @@
+<?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:xsd="http://www.w3.org/2001/XMLSchema"

+           name="StockQuoteComposite">

+

+    <component name="USDStockQuoteComponent">

+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

+            bundleSymbolicName="stockquote.StockQuoteFactory"

+            classes="stockquote.OSGiStockQuoteImpl">

+            

+        </implementation.osgi>

+       

+        

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

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

+            

+    </component>

+    

+    <component name="EUROStockQuoteComponent">

+        <implementation.osgi xmlns="http://tuscany.apache.org/xmlns/sca/1.0"

+            bundleSymbolicName="stockquote.StockQuoteFactory"

+            classes="stockquote.OSGiStockQuoteImpl">

+            

+        </implementation.osgi>

+        

+        

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

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

+            

+    </component>

+

+</composite>