Author: slaws
Date: Wed Aug 22 05:53:53 2007
New Revision: 568600
URL: http://svn.apache.org/viewvc?rev=568600&view=rev
Log:
Move service registration to remote part of the binding
More tests
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java?rev=568600&r1=568599&r2=568600&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
Wed Aug 22 05:53:53 2007
@@ -22,10 +22,13 @@
import org.apache.axiom.om.OMElement;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
+import org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl;
import org.apache.tuscany.sca.binding.ws.DefaultWebServiceBindingFactory;
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvider;
import org.apache.tuscany.sca.binding.ws.axis2.Java2WSDLHelper;
+import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;
+import org.apache.tuscany.sca.distributed.management.ServiceDiscovery;
import org.apache.tuscany.sca.http.ServletHost;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
@@ -80,6 +83,27 @@
messageFactory);
this.binding.setURI(wsBinding.getURI());
+
+ // get the url out of the binding and send it to the registry if
+ // a distributed domain is configured
+ DistributedSCADomain distributedDomain =
((SCABindingImpl)this.binding).getDistributedDomain();
+
+ ServiceDiscovery serviceDiscovery =
distributedDomain.getServiceDiscovery();
+
+ // register endpoint twice to take account the formats
+ // ComponentName
+ // ComponentName/ServiceName
+ // TODO - Can't we get this from somewhere? What happens with nested
components.
+
serviceDiscovery.registerServiceEndpoint(distributedDomain.getDomainName(),
+
distributedDomain.getNodeName(),
+ component.getName(),
+ SCABinding.class.getName(),
+ this.binding.getURI());
+
serviceDiscovery.registerServiceEndpoint(distributedDomain.getDomainName(),
+
distributedDomain.getNodeName(),
+ component.getName() + "/" +
this.binding.getName(),
+ SCABinding.class.getName(),
+ this.binding.getURI());
}
public InterfaceContract getBindingInterfaceContract() {
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
Wed Aug 22 05:53:53 2007
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.sca.binding.sca.axis2;
+
+import java.net.URL;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
+import
org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;
+import
org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class AsynchTestCase extends BaseTest {
+
+ public static EmbeddedSCADomain domainA;
+ public static EmbeddedSCADomain domainB;
+
+ @BeforeClass
+ public static void init() throws Exception {
+ System.out.println("Setting up distributed nodes");
+
+ try {
+ // create and start domainA
+// domainA = createDomain("nodeE");
+// domainB = createDomain("nodeF");
+// startDomain(domainA);
+// startDomain(domainB);
+
+ } catch (Exception ex) {
+ System.err.println("Exception when creating domain " +
ex.getMessage());
+ ex.printStackTrace(System.err);
+ throw ex;
+ }
+ }
+
+ @AfterClass
+ public static void destroy() throws Exception {
+ // stop the nodes and hence the domains they contain
+// stopDomain(domainA);
+// stopDomain(domainB);
+ }
+
+
+ @Test
+ public void testHelloWorldCallbackRemote() throws Exception {
+ HelloWorldClient helloWorldClientA;
+// helloWorldClientA = domainA.getService(HelloWorldClient.class,
"AHelloWorldClientCallbackRemote");
+// Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello
fred");
+
+ }
+
+}
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java?rev=568600&r1=568599&r2=568600&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
Wed Aug 22 05:53:53 2007
@@ -33,30 +33,21 @@
public static String DEFULT_DOMAIN_NAME = "mydomain";
- public static DistributedSCADomain distributedDomainA;
- public static DistributedSCADomain distributedDomainB;
- public static EmbeddedSCADomain domainA;
- public static EmbeddedSCADomain domainB;
-
- @BeforeClass
- public static void init() throws Exception {
- System.out.println("Setting up distributed nodes");
+ public static EmbeddedSCADomain createDomain(String nodeName) throws
Exception {
ClassLoader cl = BaseTest.class.getClassLoader();
+ EmbeddedSCADomain domain = null;
try {
- // create nodeA to run clients
- String nodeName = "nodeA";
-
// Create the distributed domain representation
- distributedDomainA = new
TestDistributedSCADomainImpl(DEFULT_DOMAIN_NAME);
- distributedDomainA.setNodeName(nodeName);
+ TestDistributedSCADomainImpl distributedDomain = new
TestDistributedSCADomainImpl(DEFULT_DOMAIN_NAME);
+ distributedDomain.setNodeName(nodeName);
// create and start domainA
- domainA = new EmbeddedSCADomain(cl, DEFULT_DOMAIN_NAME);
- domainA.start();
+ domain = new EmbeddedSCADomain(cl, DEFULT_DOMAIN_NAME);
+ domain.start();
- // add a contribution to A
- ContributionService contributionService =
domainA.getContributionService();
+ // add a contribution to the domain
+ ContributionService contributionService =
domain.getContributionService();
// find the current directory as a URL. This is where our
contribution
// will come from
@@ -68,52 +59,26 @@
Composite composite = contribution.getDeployables().get(0);
// Add the deployable composite to the domain
- domainA.getDomainComposite().getIncludes().add(composite);
- domainA.getCompositeBuilder().build(composite);
-
- distributedDomainA.addDistributedDomainToBindings(composite);
-
- domainA.getCompositeActivator().activate(composite);
-
- // create nodeB to run remote services
- nodeName = "nodeB";
-
- // Create the distributed domain representation
- distributedDomainB = new
TestDistributedSCADomainImpl(DEFULT_DOMAIN_NAME);
- distributedDomainB.setNodeName(nodeName);
-
- // create and start domainB
- domainB = new EmbeddedSCADomain(cl, DEFULT_DOMAIN_NAME);
- domainB.start();
-
- // add a contribution to B
- contributionService = domainB.getContributionService();
-
- // find the current directory as a URL. This is where our
contribution
- // will come from
- contributionURL =
Thread.currentThread().getContextClassLoader().getResource(nodeName + "/");
-
- // Contribute the SCA application
- contribution = contributionService.contribute("http://calculator";,
contributionURL, null, //resolver,
- false);
- composite = contribution.getDeployables().get(0);
-
- // Add the deployable composite to the domain
- domainB.getDomainComposite().getIncludes().add(composite);
- domainB.getCompositeBuilder().build(composite);
+ domain.getDomainComposite().getIncludes().add(composite);
+ domain.getCompositeBuilder().build(composite);
- distributedDomainB.addDistributedDomainToBindings(composite);
+ distributedDomain.addDistributedDomainToBindings(composite);
- domainB.getCompositeActivator().activate(composite);
-
- // Start node A
- for (Composite compositeA :
domainA.getDomainComposite().getIncludes()) {
- domainA.getCompositeActivator().start(compositeA);
- }
+ domain.getCompositeActivator().activate(composite);
+ } catch (Exception ex) {
+ System.err.println("Exception when creating domain " +
ex.getMessage());
+ ex.printStackTrace(System.err);
+ throw ex;
+ }
+ return domain;
+ }
- // start node B
- for (Composite compositeB :
domainB.getDomainComposite().getIncludes()) {
- domainB.getCompositeActivator().start(compositeB);
+ public static void startDomain(EmbeddedSCADomain domain)
+ throws Exception {
+ try {
+ // Start domain
+ for (Composite composite :
domain.getDomainComposite().getIncludes()) {
+ domain.getCompositeActivator().start(composite);
}
} catch (Exception ex) {
@@ -121,14 +86,11 @@
ex.printStackTrace(System.err);
throw ex;
}
-
}
- @AfterClass
- public static void destroy() throws Exception {
- // stop the nodes and hence the domains they contain
- domainA.stop();
- domainB.stop();
+ public static void stopDomain(EmbeddedSCADomain domain) throws Exception {
+ // stop the domain
+ domain.stop();
}
}
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
Wed Aug 22 05:53:53 2007
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+package org.apache.tuscany.sca.binding.sca.axis2;
+
+import java.net.URL;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
+import
org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;
+import
org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class PromotionTestCase extends BaseTest {
+
+ public static EmbeddedSCADomain domainA;
+ public static EmbeddedSCADomain domainB;
+
+ @BeforeClass
+ public static void init() throws Exception {
+ System.out.println("Setting up distributed nodes");
+
+ try {
+ // create and start domainA
+ domainA = createDomain("nodeC");
+ domainB = createDomain("nodeD");
+ startDomain(domainA);
+ startDomain(domainB);
+
+ } catch (Exception ex) {
+ System.err.println("Exception when creating domain " +
ex.getMessage());
+ ex.printStackTrace(System.err);
+ throw ex;
+ }
+ }
+
+ @AfterClass
+ public static void destroy() throws Exception {
+ // stop the nodes and hence the domains they contain
+ stopDomain(domainA);
+ stopDomain(domainB);
+ }
+
+ @Test
+ public void testHelloWorldPromotion() throws Exception {
+ HelloWorldClient helloWorldClientA;
+ helloWorldClientA = domainA.getService(HelloWorldClient.class,
"AHelloWorldClientRemotePromotion");
+ Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello
fred");
+
+ }
+
+}
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java?rev=568600&r1=568599&r2=568600&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
Wed Aug 22 05:53:53 2007
@@ -18,15 +18,52 @@
*/
package org.apache.tuscany.sca.binding.sca.axis2;
+import java.net.URL;
+
import junit.framework.Assert;
+import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
import
org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;
import
org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.service.ContributionService;
+import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;
+import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
public class SimpleTestCase extends BaseTest {
+ public static EmbeddedSCADomain domainA;
+ public static EmbeddedSCADomain domainB;
+
+ @BeforeClass
+ public static void init() throws Exception {
+ System.out.println("Setting up distributed nodes");
+
+ try {
+ // create and start domainA
+ domainA = createDomain("nodeA");
+ domainB = createDomain("nodeB");
+ startDomain(domainA);
+ startDomain(domainB);
+
+ } catch (Exception ex) {
+ System.err.println("Exception when creating domain " +
ex.getMessage());
+ ex.printStackTrace(System.err);
+ throw ex;
+ }
+ }
+
+ @AfterClass
+ public static void destroy() throws Exception {
+ // stop the nodes and hence the domains they contain
+ stopDomain(domainA);
+ stopDomain(domainB);
+ }
+
@Test
public void testHelloWorldLocal() throws Exception {
HelloWorldClient helloWorldClientA =
domainA.getService(HelloWorldClient.class, "AHelloWorldClientLocal");
@@ -58,6 +95,14 @@
Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello
fred");
Assert.assertEquals(helloWorldClientA2.getGreetings("fred"), "Hello
fred");
Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello
fred");
- }
+ }
+
+ //@Test
+ public void testHelloWorldMultipleBindings() throws Exception {
+ HelloWorldClient helloWorldClientA;
+ helloWorldClientA = domainA.getService(HelloWorldClient.class,
"AHelloWorldClientMultipleBindings");
+ Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello
fred");
+
+ }
}
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
Wed Aug 22 05:53:53 2007
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.binding.sca.axis2.helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
[EMAIL PROTECTED]
+public interface HelloWorldCallbackRemote {
+
+ public String getGreetingsCallbackRemote(String s);
+
+}
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
Wed Aug 22 05:53:53 2007
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.binding.sca.axis2.helloworld;
+
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Remotable;
+
[EMAIL PROTECTED]
[EMAIL PROTECTED](HelloWorldCallbackRemote.class)
+public interface HelloWorldServiceCallbackRemote {
+
+ public String getGreetingsRemote(String s);
+
+}
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
Wed Aug 22 05:53:53 2007
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl;
+
+import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
+import
org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote;
+import org.osoa.sca.annotations.Reference;
+
+public class HelloWorldClientCallbackRemoteImpl implements HelloWorldClient {
+
+ @Reference
+ public HelloWorldServiceCallbackRemote helloWorldService;
+
+ public String getGreetings(String s) {
+ return helloWorldService.getGreetingsRemote(s);
+ }
+
+ public String getGreetingsCallbackRemote(String s) {
+ return "callback " + s;
+ }
+
+}
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
Wed Aug 22 05:53:53 2007
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl;
+
+import
org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote;
+import
org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote;
+import org.osoa.sca.annotations.Callback;
+
+public class HelloWorldServiceCallbackRemoteImpl implements
HelloWorldServiceCallbackRemote {
+
+ @Callback
+ protected HelloWorldCallbackRemote theCallback;
+
+ public String getGreetingsRemote(String s) {
+ return "Hello " + theCallback.getGreetingsCallbackRemote(s);
+ }
+
+}
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite?rev=568600&r1=568599&r2=568600&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
Wed Aug 22 05:53:53 2007
@@ -22,9 +22,10 @@
xmlns:sample="http://sample";
name="HelloWorld">
+
<!-- local only wire -->
<component name="AHelloWorldClientLocal">
- <implementation.java
class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl"
/>
+ <implementation.java
class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl"/>
<reference name="helloWorldService" target="AHelloWorldServiceLocal" />
</component>
@@ -54,6 +55,17 @@
<implementation.java
class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemote2Impl"
/>
<reference name="helloWorldService"
target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2" />
</component>
+
+ <!-- multiple bindings -->
+ <!--component name="AHelloWorldClientMultipleBindings">
+ <implementation.java
class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl"
/>
+ <reference name="helloWorldService" target="BHelloWorldServiceRemote" >
+ <interface.java
interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote"
/>
+ <binding.sca/>
+ <binding.ws/>
+ </reference>
+ </component-->
+
</composite>
Modified:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite?rev=568600&r1=568599&r2=568600&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
Wed Aug 22 05:53:53 2007
@@ -51,4 +51,20 @@
<reference name="helloWorldService"
target="BHelloWorldServiceMultipleServices/HelloWorldServiceLocal" />
</component>
+ <!-- multiple bindings -->
+ <!--component name="BHelloWorldMultipleBindings">
+ <implementation.java
class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl"
/>
+ <service name="HelloWorldServiceRemote">
+ <interface.java
interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote"
/>
+ <binding.ws/>
+ <binding.sca/>
+ </service>
+ </component-->
+
+
+ <!-- Dynamic interfaces -->
+ <!--component name="BHelloWorldServiceScript">
+ <implementation.script script="calculator/AddServiceImpl.js"/>
+ </component-->
+
</composite>
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
Wed Aug 22 05:53:53 2007
@@ -0,0 +1,33 @@
+<?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://sample";
+ xmlns:sample="http://sample";
+ name="HelloWorld">
+
+
+ <!-- composite hierarchy -->
+ <component name="AHelloWorldClientRemotePromotion">
+ <implementation.composite name="sample:HelloWorldComponent" />
+ <reference name="AHelloWorldClientRemoteReference"
target="BHelloWorldServiceRemotePromotion"/>
+ </component>
+
+
+</composite>
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
Wed Aug 22 05:53:53 2007
@@ -0,0 +1,37 @@
+<?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://sample";
+ xmlns:sample="http://sample";
+ name="HelloWorldComponent">
+
+ <service name="AHelloWorldClientRemoteService"
promote="AHelloWorldClientRemoteComponent">
+ <interface.java
interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient"/>
+ </service>
+
+ <reference name="AHelloWorldClientRemoteReference"
promote="AHelloWorldClientRemoteComponent/helloWorldService">
+ <interface.java
interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote"/>
+ </reference>
+
+ <component name="AHelloWorldClientRemoteComponent">
+ <implementation.java
class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl"/>
+ </component>
+
+</composite>
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
Wed Aug 22 05:53:53 2007
@@ -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://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://sample";
+ xmlns:sample="http://sample";>
+ <deployable composite="sample:HelloWorld"/>
+</contribution>
\ No newline at end of file
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
Wed Aug 22 05:53:53 2007
@@ -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
+ * "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://sample";
+ xmlns:sample="http://sample";
+ name="HelloWorld">
+
+
+ <!-- composite hierarchy -->
+ <component name="BHelloWorldServiceRemotePromotion">
+ <implementation.composite name="sample:HelloWorldComponent" />
+ </component>
+
+
+</composite>
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
Wed Aug 22 05:53:53 2007
@@ -0,0 +1,37 @@
+<?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://sample";
+ xmlns:sample="http://sample";
+ name="HelloWorldComponent">
+
+ <service name="BHelloWorldServiceRemoteService"
+
promote="BHelloWorldServiceRemoteComponent/HelloWorldServiceRemote"/>
+
+ <component name="BHelloWorldServiceRemoteComponent">
+ <implementation.java
class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl"/>
+ </component>
+
+ <component name="BHelloWorldServiceLocalAndRemoteNested">
+ <implementation.java
class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl"
/>
+ </component>
+
+
+</composite>
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
Wed Aug 22 05:53:53 2007
@@ -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://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://sample";
+ xmlns:sample="http://sample";>
+ <deployable composite="sample:HelloWorld"/>
+</contribution>
\ No newline at end of file
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
Wed Aug 22 05:53:53 2007
@@ -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
+ * "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://sample";
+ xmlns:sample="http://sample";
+ name="HelloWorld">
+
+ <!-- callback remote wire -->
+ <component name="AHelloWorldClientCallbackRemote">
+ <implementation.java
class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl"
/>
+ <reference name="helloWorldService"
target="BHelloWorldServiceCallbackRemote" />
+ </component>
+
+</composite>
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
Wed Aug 22 05:53:53 2007
@@ -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://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://sample";
+ xmlns:sample="http://sample";>
+ <deployable composite="sample:HelloWorld"/>
+</contribution>
\ No newline at end of file
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
Wed Aug 22 05:53:53 2007
@@ -0,0 +1,35 @@
+<?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://sample";
+ xmlns:sample="http://sample";
+ name="HelloWorld">
+
+
+ <!-- callback remote wire -->
+ <component name="BHelloWorldServiceCallbackRemote">
+ <implementation.java
class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackRemoteImpl"
/>
+ <service name="HelloWorldServiceCallbackRemote">
+ <!-- explicit uri required as callback service will also come up
on 8085 -->
+ <binding.sca
uri="http://localhost:8086/BHelloWorldServiceCallbackRemote"/>
+ </service>
+ </component>
+
+</composite>
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml?rev=568600&view=auto
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
(added)
+++
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
Wed Aug 22 05:53:53 2007
@@ -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://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://sample";
+ xmlns:sample="http://sample";>
+ <deployable composite="sample:HelloWorld"/>
+</contribution>
\ No newline at end of file
Modified:
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java?rev=568600&r1=568599&r2=568600&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
Wed Aug 22 05:53:53 2007
@@ -86,26 +86,6 @@
distributedProvider = (ServiceBindingProvider2)
distributedProviderFactory.createServiceBindingProvider(component, service,
distributedBinding);
- // get the url out of the binding and send it to the
registry if
- // a distributed domain is configured
- DistributedSCADomain distributedDomain =
((SCABindingImpl)binding).getDistributedDomain();
-
- ServiceDiscovery serviceDiscovery =
distributedDomain.getServiceDiscovery();
-
- // register endpoint twice to take account the formats
- // ComponentName
- // ComponentName/ServiceName
- // TODO - Can't we get this from somewhere? What happens
with nested components.
-
serviceDiscovery.registerServiceEndpoint(distributedDomain.getDomainName(),
-
distributedDomain.getNodeName(),
-
component.getName(),
-
SCABinding.class.getName(),
- binding.getURI());
-
serviceDiscovery.registerServiceEndpoint(distributedDomain.getDomainName(),
-
distributedDomain.getNodeName(),
-
component.getName() + "/" + service.getName(),
-
SCABinding.class.getName(),
- binding.getURI());
} else {
/* do nothing at the moment as only apps using the node
inplementation
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
