Author: slaws
Date: Thu Oct 13 09:22:15 2011
New Revision: 1182735
URL: http://svn.apache.org/viewvc?rev=1182735&view=rev
Log:
Move match composites into appropriately named directories.
Added:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/
(with props)
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/
(with props)
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedClient.composite
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedService.composite
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/local/
(with props)
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/local/MatchLocal.composite
Removed:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchDistributedClient.composite
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchDistributedService.composite
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedClient.composite
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedService.composite
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/local/MatchLocal.composite
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMatchTestCase.java
Propchange:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/
------------------------------------------------------------------------------
bugtraq:number = true
Propchange:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/
------------------------------------------------------------------------------
bugtraq:number = true
Added:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite?rev=1182735&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite
Thu Oct 13 09:22:15 2011
@@ -0,0 +1,29 @@
+<?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
+ * 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/200912";
+ xmlns:foo="http://foo"; targetNamespace="http://foo";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ name="MatchDistributedClient" >
+
+ <component name="DistributedClientComponent">
+ <implementation.java
class="org.apache.tuscany.sca.itest.interfaces.ClientComponentImpl" />
+ <reference name="aCallBackService"
target="DistributedServiceComponent" />
+ </component>
+
+</composite>
\ No newline at end of file
Added:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite?rev=1182735&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite
Thu Oct 13 09:22:15 2011
@@ -0,0 +1,31 @@
+<?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
+ * 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/200912";
+ xmlns:foo="http://foo"; targetNamespace="http://foo";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ name="MatchDistributedService" >
+
+ <component name="DistributedServiceComponent">
+ <implementation.java
class="org.apache.tuscany.sca.itest.interfaces.ServiceComponentImpl" />
+<!--
+ <reference name="chainedCallbackReference"
target="DistributedServiceComponent">
+ </reference>
+-->
+ </component>
+</composite>
\ No newline at end of file
Added:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedClient.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedClient.composite?rev=1182735&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedClient.composite
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedClient.composite
Thu Oct 13 09:22:15 2011
@@ -0,0 +1,29 @@
+<?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
+ * 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/200912";
+ xmlns:foo="http://foo"; targetNamespace="http://foo";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ name="MatchNonJAXBDistributedClient" >
+
+ <component name="DistributedClientComponent">
+ <implementation.java
class="org.apache.tuscany.sca.itest.interfaces.NonJAXBClientComponentImpl" />
+ <reference name="aCallBackService"
target="DistributedServiceComponent" />
+ </component>
+
+</composite>
\ No newline at end of file
Added:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedService.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedService.composite?rev=1182735&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedService.composite
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedService.composite
Thu Oct 13 09:22:15 2011
@@ -0,0 +1,27 @@
+<?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
+ * 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/200912";
+ xmlns:foo="http://foo"; targetNamespace="http://foo";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ name="MatchNonJAXBDistributedService" >
+
+ <component name="DistributedServiceComponent">
+ <implementation.java
class="org.apache.tuscany.sca.itest.interfaces.NonJAXBServiceComponentImpl" />
+ </component>
+</composite>
\ No newline at end of file
Propchange:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/local/
------------------------------------------------------------------------------
bugtraq:number = true
Added:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/local/MatchLocal.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/local/MatchLocal.composite?rev=1182735&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/local/MatchLocal.composite
(added)
+++
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/local/MatchLocal.composite
Thu Oct 13 09:22:15 2011
@@ -0,0 +1,32 @@
+<?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
+ * 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/200912";
+ xmlns:foo="http://foo"; targetNamespace="http://foo";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ name="MatchLocal" >
+
+ <component name="LocalClientComponent">
+ <implementation.java
class="org.apache.tuscany.sca.itest.interfaces.LocalClientComponentImpl" />
+ <reference name="aCallBackService" target="LocalServiceComponent" />
+ </component>
+
+ <component name="LocalServiceComponent">
+ <implementation.java
class="org.apache.tuscany.sca.itest.interfaces.LocalServiceComponentImpl" />
+ </component>
+</composite>
\ No newline at end of file
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMatchTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMatchTestCase.java?rev=1182735&r1=1182734&r2=1182735&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMatchTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMatchTestCase.java
Thu Oct 13 09:22:15 2011
@@ -44,7 +44,7 @@ public class InerfaceMatchTestCase {
public void testLocal() throws Exception {
String [] contributions = {"./target/classes"};
Node node1 =
NodeFactory.newInstance().createNode(URI.create("uri:default"),
-
"org/apache/tuscany/sca/itest/interfaces/missmatch/local/MatchLocal.composite",
+
"org/apache/tuscany/sca/itest/interfaces/match/local/MatchLocal.composite",
contributions);
node1.start();
@@ -76,12 +76,12 @@ public class InerfaceMatchTestCase {
String [] contributions = {"./target/classes"};
Node node1 =
NodeFactory.newInstance().createNode(URI.create("uri:default"),
-
"org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchDistributedClient.composite",
+
"org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite",
contributions);
node1.start();
Node node2 =
NodeFactory.newInstance().createNode(URI.create("uri:default"),
-
"org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchDistributedService.composite",
+
"org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite",
contributions);
// for default binding on node2 to use a different port from node
1(which will default to 8080
@@ -129,12 +129,12 @@ public class InerfaceMatchTestCase {
String [] contributions = {"./target/classes"};
Node node1 =
NodeFactory.newInstance().createNode(URI.create("uri:default"),
-
"org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedClient.composite",
+
"org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedClient.composite",
contributions);
node1.start();
Node node2 =
NodeFactory.newInstance().createNode(URI.create("uri:default"),
-
"org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MatchNonJAXBDistributedService.composite",
+
"org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedService.composite",
contributions);
// for default binding on node2 to use a different port from node
1(which will default to 8080
