Author: slaws
Date: Fri Nov 9 08:25:50 2007
New Revision: 593582
URL: http://svn.apache.org/viewvc?rev=593582&view=rev
Log:
Conver the oneway itest to the new node implementation so that it doesn't
depend on a set ip address
turn it on in the itest/pom.xml
Added:
incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/
incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/
incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/
incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
Removed:
incubator/tuscany/java/sca/itest/oneway/src/main/resources/oneWay.composite
incubator/tuscany/java/sca/itest/oneway/src/main/resources/oneWayClient.composite
incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayClientTest.java
Modified:
incubator/tuscany/java/sca/itest/oneway/pom.xml
incubator/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
incubator/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
incubator/tuscany/java/sca/itest/pom.xml
Modified: incubator/tuscany/java/sca/itest/oneway/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/oneway/pom.xml?rev=593582&r1=593581&r2=593582&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/oneway/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/oneway/pom.xml Fri Nov 9 08:25:50 2007
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
@@ -47,6 +47,13 @@
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
Modified:
incubator/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java?rev=593582&r1=593581&r2=593582&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
(original)
+++
incubator/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
Fri Nov 9 08:25:50 2007
@@ -43,8 +43,8 @@
callCount = callCount + count;
for (int loopCount = 0; loopCount < count; loopCount++){
- System.out.println("Client: doSomething " + loopCount);
- System.out.flush();
+ //System.out.println("Client: doSomething " + loopCount);
+ //System.out.flush();
oneWayService.doSomething(loopCount);
}
Modified:
incubator/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java?rev=593582&r1=593581&r2=593582&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
Fri Nov 9 08:25:50 2007
@@ -37,8 +37,8 @@
callCount++;
}
- System.out.println("Service: doSomething " + count + " callCount = " +
callCount);
- System.out.flush();
+ // System.out.println("Service: doSomething " + count + " callCount = "
+ callCount);
+ // System.out.flush();
}
Added:
incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite?rev=593582&view=auto
==============================================================================
---
incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
(added)
+++
incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
Fri Nov 9 08:25:50 2007
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ name="OneWayITest">
+
+ <component name="OneWayClientComponent">
+ <implementation.java
class="org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl"/>
+ <reference name="oneWayService" target="OneWayServiceComponent">
+ <interface.java
interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />
+ <binding.ws/>
+ </reference>
+ </component>
+
+ <component name="OneWayServiceComponent">
+ <implementation.java
class="org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl"/>
+ <service name="OneWayService">
+ <interface.java
interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />
+ <binding.ws/>
+ </service>
+ </component>
+
+</composite>
Modified:
incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java?rev=593582&r1=593581&r2=593582&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
Fri Nov 9 08:25:50 2007
@@ -19,11 +19,15 @@
package org.apache.tuscany.sca.itest.oneway;
+import javax.xml.namespace.QName;
+
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.domain.SCADomain;
import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl;
import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -34,14 +38,17 @@
@Before
public void setUp() throws Exception {
- domain = SCADomain.newInstance("oneWay.composite");
-
+ SCANode node = SCANodeFactory.newInstance().createSCANode(null, null);
+ node.addContribution("mycontribution",
+
OneWayTestCase.class.getResource("/OneWayContribution/."));
+ node.start();
+ domain = node.getDomain();
}
@After
public void tearDown() throws Exception {
if (domain != null) {
- domain.close();
+ domain.destroy();
}
}
@@ -54,8 +61,8 @@
int count = 100;
for (int i = 0; i < 10; i++){
- System.out.println("Test: doSomething " + count);
- System.out.flush();
+ // System.out.println("Test: doSomething " + count);
+ // System.out.flush();
client.doSomething(count);
Thread.sleep(2000);
Modified: incubator/tuscany/java/sca/itest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?rev=593582&r1=593581&r2=593582&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Fri Nov 9 08:25:50 2007
@@ -62,6 +62,7 @@
<module>interop-soap-service</module>
-->
<module>large-sdo-ws</module>
+ <module>oneway</module>
<module>operation-overloading</module>
<module>osgi-implementation</module>
<module>osgi-contribution</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
