You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/09/21 06:00:10 UTC
svn commit: r817146 - in /tuscany/java/sca/modules/binding-http-runtime: ./
src/main/java/org/apache/tuscany/sca/binding/http/provider/
src/test/java/org/apache/tuscany/sca/binding/http/ src/test/resources/
Author: lresende
Date: Mon Sep 21 04:00:09 2009
New Revision: 817146
URL: http://svn.apache.org/viewvc?rev=817146&view=rev
Log:
Bringing up HTTP Binding test cases
Modified:
tuscany/java/sca/modules/binding-http-runtime/pom.xml
tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
tuscany/java/sca/modules/binding-http-runtime/src/test/resources/test.composite
tuscany/java/sca/modules/binding-http-runtime/src/test/resources/testCache.composite
Modified: tuscany/java/sca/modules/binding-http-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/pom.xml?rev=817146&r1=817145&r2=817146&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-http-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-http-runtime/pom.xml Mon Sep 21 04:00:09 2009
@@ -74,6 +74,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>test</scope>
Modified: tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java?rev=817146&r1=817145&r2=817146&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java (original)
+++ tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java Mon Sep 21 04:00:09 2009
@@ -51,6 +51,7 @@
}
public ReferenceBindingProvider createReferenceBindingProvider(EndpointReference endpointReference) {
+ // Binding HTTP is currently NOT supporting References
return null;
}
Modified: tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java?rev=817146&r1=817145&r2=817146&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java (original)
+++ tuscany/java/sca/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java Mon Sep 21 04:00:09 2009
@@ -69,10 +69,10 @@
ServletHost servletHost) {
this.endpoint = endpoint;
- this.component = component;
- this.service = service;
+ this.component = (RuntimeComponent)endpoint.getComponent();
+ this.service = (RuntimeComponentService)endpoint.getService();
+ this.binding = (HTTPBinding)endpoint.getBinding();
- this.binding = binding;
this.extensionPoints = extensionPoints;
this.messageFactory = messageFactory;
this.servletHost = servletHost;
Modified: tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java?rev=817146&r1=817145&r2=817146&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java (original)
+++ tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java Mon Sep 21 04:00:09 2009
@@ -29,7 +29,10 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
/**
* HTTP binding unit tests.
@@ -53,16 +56,23 @@
private static final int HTTP_PORT = 8085;
- private SCADomain scaDomain;
+ private static Node node;
@Override
protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("testCache.composite");
+ try {
+ String contribution = ContributionLocationHelper.getContributionLocation(HTTPBindingCacheTestCase.class);
+ node = NodeFactory.newInstance().createNode("testCache.composite", new Contribution("test", contribution));
+ node.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@Override
protected void tearDown() throws Exception {
- scaDomain.close();
+ node.stop();
+ node.destroy();
}
/**
Modified: tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java?rev=817146&r1=817145&r2=817146&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java (original)
+++ tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java Mon Sep 21 04:00:09 2009
@@ -27,7 +27,10 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
/**
* HTTP binding unit tests.
@@ -65,16 +68,23 @@
private static final int HTTP_PORT = 8085;
- private SCADomain scaDomain;
+ private static Node node;
@Override
protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("test.composite");
+ try {
+ String contribution = ContributionLocationHelper.getContributionLocation(HTTPBindingCacheTestCase.class);
+ node = NodeFactory.newInstance().createNode("test.composite", new Contribution("test", contribution));
+ node.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@Override
protected void tearDown() throws Exception {
- scaDomain.close();
+ node.stop();
+ node.destroy();
}
/**
Modified: tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java?rev=817146&r1=817145&r2=817146&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java (original)
+++ tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java Mon Sep 21 04:00:09 2009
@@ -23,12 +23,11 @@
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
/**
* Test service implementation.
Modified: tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java?rev=817146&r1=817145&r2=817146&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java (original)
+++ tuscany/java/sca/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java Mon Sep 21 04:00:09 2009
@@ -23,12 +23,11 @@
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
/**
* Test service implementation.
Modified: tuscany/java/sca/modules/binding-http-runtime/src/test/resources/test.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/test/resources/test.composite?rev=817146&r1=817145&r2=817146&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-http-runtime/src/test/resources/test.composite (original)
+++ tuscany/java/sca/modules/binding-http-runtime/src/test/resources/test.composite Mon Sep 21 04:00:09 2009
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
targetNamespace="http://sample/test"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
xmlns:sr="http://sample/test"
name="test">
Modified: tuscany/java/sca/modules/binding-http-runtime/src/test/resources/testCache.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-http-runtime/src/test/resources/testCache.composite?rev=817146&r1=817145&r2=817146&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-http-runtime/src/test/resources/testCache.composite (original)
+++ tuscany/java/sca/modules/binding-http-runtime/src/test/resources/testCache.composite Mon Sep 21 04:00:09 2009
@@ -17,9 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
targetNamespace="http://sample/test"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
xmlns:sr="http://sample/test"
name="test">