From 4e13586bc791d71c41760cf4d0a5cc908973de3e Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 11 Nov 2009 23:09:18 +0000
Subject: Moving 2.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835134 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/callback-accessing.composite    | 34 ------------------
 .../src/main/resources/callback-custom.composite   | 40 ---------------------
 .../src/main/resources/callback-id.composite       | 34 ------------------
 .../src/main/resources/callback-local.composite    | 40 ---------------------
 .../src/main/resources/callback-mixed.composite    | 40 ---------------------
 .../src/main/resources/callback-multi.composite    | 35 ------------------
 .../callback-stateless-callbackfieldnull.composite | 40 ---------------------
 .../callback-stateless-callbackid.composite        | 40 ---------------------
 .../main/resources/callback-stateless.composite    | 41 ----------------------
 .../callback/src/main/resources/callback.composite | 40 ---------------------
 10 files changed, 384 deletions(-)
 delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
 delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
 delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
 delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
 delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
 delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
 delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
 delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
 delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
 delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback.composite

(limited to 'branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources')

diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
deleted file mode 100644
index 802c9c30db..0000000000
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
+++ /dev/null
@@ -1,34 +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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://java-api-tests" name="Conversation-callback-multi">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.accessing.impl.BServiceImpl" />
-	</component>
-
-</composite>
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
deleted file mode 100644
index e66ea5d537..0000000000
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
+++ /dev/null
@@ -1,40 +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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://java-api-tests" name="Conversation-callback-custom">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-		<reference name="customCallback" target="CComponent/CustomCallback" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl.BServiceImpl" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.custom.impl.CustomCallbackImpl" />
-	</component>
-
-</composite>
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
deleted file mode 100644
index 4d93d2279d..0000000000
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
+++ /dev/null
@@ -1,34 +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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://java-api-tests" name="Conversation-callback-id">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.id.impl.BServiceImpl" />
-	</component>
-
-</composite>
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
deleted file mode 100644
index cd8c589a59..0000000000
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
+++ /dev/null
@@ -1,40 +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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://java-api-tests" name="Conversation-Callback-local">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl.BServiceImpl" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.local.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite b/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
deleted file mode 100644
index d2d9956103..0000000000
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
+++ /dev/null
@@ -1,40 +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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://java-api-tests" name="Conversation-callback-mixed">
-<!-- TODO: TUSCANY-2291 
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.impl.BServiceImpl" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.mixed.impl.CServiceImpl" />
-	</component>
--->
-</composite>
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
deleted file mode 100644
index 6c69330ce5..0000000000
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
+++ /dev/null
@@ -1,35 +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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://java-api-tests" name="Conversation-callback-multi">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.impl.AServiceImpl" />
-		<reference name="b" target="BComponent/BService" />
-		<reference name="b2" target="BComponent/BService2" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.impl.BServiceImpl" />
-	</component>
-
-</composite>
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
deleted file mode 100644
index 72c08e8344..0000000000
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
+++ /dev/null
@@ -1,40 +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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://java-api-tests" name="Conversation-callback-stateless">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.BServiceImpl3" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
deleted file mode 100644
index 144f7f3d00..0000000000
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
+++ /dev/null
@@ -1,40 +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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://java-api-tests" name="Conversation-callback-stateless">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.BServiceImpl2" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.CServiceImpl" />
-	</component>
-
-</composite>
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
deleted file mode 100644
index ace06b245c..0000000000
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
+++ /dev/null
@@ -1,41 +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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://java-api-tests" name="Conversation-callback-stateless">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.BServiceImpl" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.stateless.impl.CServiceImpl" />
-	</component>
-
-
-</composite>
diff --git a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback.composite
deleted file mode 100644
index 4623f17ca2..0000000000
--- a/branches/sca-java-2.0-M2/vtest/java-api/conversation/callback/src/main/resources/callback.composite
+++ /dev/null
@@ -1,40 +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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://java-api-tests" name="Conversation-callback">
-
-	<component name="AComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.AServiceImpl" />
-		<reference name="b" target="BComponent" />
-	</component>
-
-	<component name="BComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.BServiceImpl" />
-		<reference name="c" target="CComponent" />
-	</component>
-	
-	<component name="CComponent">
-		<implementation.java
-			class="org.apache.tuscany.sca.vtest.javaapi.conversation.callback.impl.CServiceImpl" />
-	</component>
-
-</composite>
-- 
cgit v1.2.3