summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--java/sca/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml24
-rw-r--r--java/sca/itest/jms/callbacks/src/main/resources/simple/client.composite2
-rw-r--r--java/sca/itest/jms/callbacks/src/main/resources/simple/tempq.composite4
-rw-r--r--java/sca/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml23
-rw-r--r--java/sca/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml23
-rw-r--r--java/sca/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml23
-rw-r--r--java/sca/itest/jms/nulls/src/main/resources/nulls.composite3
-rw-r--r--java/sca/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml24
-rw-r--r--java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite1
-rw-r--r--java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite1
-rw-r--r--java/sca/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml25
-rw-r--r--java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite2
-rw-r--r--java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite4
-rw-r--r--java/sca/itest/jms/selectors/src/main/resources/selectors/selectors.composite4
14 files changed, 153 insertions, 10 deletions
diff --git a/java/sca/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..95c3a41c43
--- /dev/null
+++ b/java/sca/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +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:itest="http://itest">
+ <deployable composite="itest:CallbackClientComposite"/>
+ <deployable composite="itest:CallbackTempQComposite"/>
+</contribution> \ No newline at end of file
diff --git a/java/sca/itest/jms/callbacks/src/main/resources/simple/client.composite b/java/sca/itest/jms/callbacks/src/main/resources/simple/client.composite
index 7c369036ad..19124fc3e6 100644
--- a/java/sca/itest/jms/callbacks/src/main/resources/simple/client.composite
+++ b/java/sca/itest/jms/callbacks/src/main/resources/simple/client.composite
@@ -18,7 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- targetNamespace="http://jms"
+ targetNamespace="http://itest"
name="CallbackClientComposite">
<component name="ClientComponent">
diff --git a/java/sca/itest/jms/callbacks/src/main/resources/simple/tempq.composite b/java/sca/itest/jms/callbacks/src/main/resources/simple/tempq.composite
index a65242fd3a..78e9f37818 100644
--- a/java/sca/itest/jms/callbacks/src/main/resources/simple/tempq.composite
+++ b/java/sca/itest/jms/callbacks/src/main/resources/simple/tempq.composite
@@ -18,8 +18,8 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- targetNamespace="http://jms"
- name="CallbackClientComposite">
+ targetNamespace="http://itest"
+ name="CallbackTempQComposite">
<!--
diff --git a/java/sca/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..07caa57490
--- /dev/null
+++ b/java/sca/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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:itest="http://itest">
+ <deployable composite="itest:DefinitionsTests"/>
+</contribution> \ No newline at end of file
diff --git a/java/sca/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..58ceeded7e
--- /dev/null
+++ b/java/sca/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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:itest="http://itest">
+ <deployable composite="itest:SimpleServiceComposite"/>
+</contribution> \ No newline at end of file
diff --git a/java/sca/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..eee9c86565
--- /dev/null
+++ b/java/sca/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?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:itest="http://itest">
+ <deployable composite="itest:Nulls"/>
+</contribution> \ No newline at end of file
diff --git a/java/sca/itest/jms/nulls/src/main/resources/nulls.composite b/java/sca/itest/jms/nulls/src/main/resources/nulls.composite
index 9f7d239e65..7c665f080c 100644
--- a/java/sca/itest/jms/nulls/src/main/resources/nulls.composite
+++ b/java/sca/itest/jms/nulls/src/main/resources/nulls.composite
@@ -19,8 +19,7 @@
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://jms"
- xmlns:itest="http://jms"
+ targetNamespace="http://itest"
name="Nulls">
<component name="Client1">
diff --git a/java/sca/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..c062ef9ec0
--- /dev/null
+++ b/java/sca/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +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:itest="http://itest">
+ <deployable composite="itest:SimpleServiceComposite"/>
+ <deployable composite="itest:SimpleClientComposite"/>
+</contribution> \ No newline at end of file
diff --git a/java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite b/java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite
index befd2ca355..9d7ec5f3f7 100644
--- a/java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite
+++ b/java/sca/itest/jms/responsecf/src/main/resources/cf/client.composite
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="SimpleClientComposite">
<component name="HelloWorldClient">
diff --git a/java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite b/java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite
index c9e638c549..8eb22aba08 100644
--- a/java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite
+++ b/java/sca/itest/jms/responsecf/src/main/resources/cf/service.composite
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ targetNamespace="http://itest"
name="SimpleServiceComposite">
<component name="HelloWorldService">
diff --git a/java/sca/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..59cf4aee9d
--- /dev/null
+++ b/java/sca/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?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:itest="http://itest">
+ <deployable composite="itest:helloworld"/>
+ <deployable composite="itest:helloworldUP"/>
+ <deployable composite="itest:Selectors"/>
+</contribution> \ No newline at end of file
diff --git a/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite b/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
index 6851acdb5d..a51d0fdffa 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
+++ b/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
@@ -18,7 +18,7 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- targetNamespace="http://helloworld"
+ targetNamespace="http://itest"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:hw="http://helloworld"
name="helloworld">
diff --git a/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite b/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
index 30db3df93b..cbf31af535 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
+++ b/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
@@ -18,10 +18,10 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- targetNamespace="http://helloworld"
+ targetNamespace="http://itest"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:hw="http://helloworld"
- name="helloworld">
+ name="helloworldUP">
<component name="HelloWorldReferenceComponent">
<implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.HelloWorldReferenceImpl" />
diff --git a/java/sca/itest/jms/selectors/src/main/resources/selectors/selectors.composite b/java/sca/itest/jms/selectors/src/main/resources/selectors/selectors.composite
index 8973946abd..c709fa6eb1 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/selectors/selectors.composite
+++ b/java/sca/itest/jms/selectors/src/main/resources/selectors/selectors.composite
@@ -18,9 +18,9 @@
* under the License.
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
- targetNamespace="http://jms"
+ targetNamespace="http://itest"
xmlns:itest="http://jms"
- name="DefinitionsTests">
+ name="Selectors">
<component name="Client1">
<implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>