diff options
Diffstat (limited to 'java')
5 files changed, 9 insertions, 10 deletions
diff --git a/java/sca/demos/alert-aggregator-webapp/pom.xml b/java/sca/demos/alert-aggregator-webapp/pom.xml index a628c44961..395981781c 100644 --- a/java/sca/demos/alert-aggregator-webapp/pom.xml +++ b/java/sca/demos/alert-aggregator-webapp/pom.xml @@ -281,6 +281,7 @@ <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> + <version>1.0-alpha-5</version> <executions> <execution> <id>start-container</id> @@ -308,14 +309,14 @@ <wait>false</wait> <configuration> <properties> - <cargo.servlet.port>8080</cargo.servlet.port> + <cargo.servlet.port>8085</cargo.servlet.port> </properties> <deployables> <deployable> <location> ${project.build.directory}/${project.build.finalName}.${project.packaging} </location> - <pingURL>http://localhost:8080/AlertsSourcesServiceJSONRPC</pingURL> + <pingURL>http://localhost:8085/AlertsSourcesServiceJSONRPC</pingURL> </deployable> </deployables> <home>${project.build.directory}/cargo-jetty</home> diff --git a/java/sca/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl b/java/sca/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl index 79b025bc73..8b376240c8 100644 --- a/java/sca/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl +++ b/java/sca/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl @@ -81,7 +81,7 @@ <wsdl:service name="AlertsService"> <wsdl:port name="AlertsPort" binding="tns:AlertsBinding"> - <wsdlsoap:address location="http://localhost:8080/services/AlertsServiceWebServiceBinding" /> + <wsdlsoap:address location="http://localhost:8085/services/AlertsServiceWebServiceBinding" /> </wsdl:port> </wsdl:service> diff --git a/java/sca/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl b/java/sca/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl index 987481bd14..d5642a32d1 100644 --- a/java/sca/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl +++ b/java/sca/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl @@ -117,7 +117,7 @@ <wsdl:service name="AlertsSourcesService"> <wsdl:port name="AlertsSourcesPort" binding="tns:AlertsSourcesBinding"> - <wsdlsoap:address location="http://localhost:8080/services/AlertsSourcesServiceWebServiceBinding" /> + <wsdlsoap:address location="http://localhost:8085/services/AlertsSourcesServiceWebServiceBinding" /> </wsdl:port> </wsdl:service> diff --git a/java/sca/demos/alert-aggregator-webapp/src/main/webapp/service.smd b/java/sca/demos/alert-aggregator-webapp/src/main/webapp/service.smd index bc77e39bf9..3c6b6c9b12 100644 --- a/java/sca/demos/alert-aggregator-webapp/src/main/webapp/service.smd +++ b/java/sca/demos/alert-aggregator-webapp/src/main/webapp/service.smd @@ -1 +1 @@ -{"SMDVersion":".1","objectName":"AlertsService","serviceType":"JSON-RPC","serviceURL":"http://localhost:8080/sample-feed-aggregator/services/AlertsServiceJSONRPC","methods":[{"name":"getAllNewAlerts","parameters":[{"name":"param0","type":"STRING"}]}]} +{"SMDVersion":".1","objectName":"AlertsService","serviceType":"JSON-RPC","serviceURL":"http://localhost:8085/sample-feed-aggregator/services/AlertsServiceJSONRPC","methods":[{"name":"getAllNewAlerts","parameters":[{"name":"param0","type":"STRING"}]}]} diff --git a/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java b/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java index 6e75ea0bdf..f0cb9ecfcb 100644 --- a/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java +++ b/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java @@ -22,9 +22,7 @@ package org.apache.tuscany.sca.demos.aggregator; import java.io.ByteArrayInputStream; import junit.framework.Assert; -import junit.framework.TestCase; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.json.JSONObject; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -65,7 +63,7 @@ public class AlertsIntegrationTest { @Test public void testGetAllNewAlerts() throws Exception { JSONObject jsonRequest = new JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAllNewAlerts\",\"id\":2}"); - JSONObject jsonResp = callService ("http://localhost:8080/demo-alert-aggregator-webapp/AlertsServiceJSONRPC", + JSONObject jsonResp = callService ("http://localhost:8085/demo-alert-aggregator-webapp/AlertsServiceJSONRPC", jsonRequest); Assert.assertNotNull(jsonResp); } @@ -73,7 +71,7 @@ public class AlertsIntegrationTest { @Test public void testAddAlertSources() throws Exception { JSONObject jsonRequest = new JSONObject("{\"params\":[{\"name\":\"news\",\"id\":\"2\",\"address\":\"www.news.com\",\"feedAddress\":\"http://news.com.com/2547-1_3-0-20.xml\",\"feedType\":\"rss\",\"lastChecked\":\"lastChecked\",\"javaClass\":\"org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl\"}],\"method\":\"addAlertSource\",\"id\":2}"); - JSONObject jsonResp = callService ("http://localhost:8080/demo-alert-aggregator-webapp/AlertsSourcesServiceJSONRPC", + JSONObject jsonResp = callService ("http://localhost:8085/demo-alert-aggregator-webapp/AlertsSourcesServiceJSONRPC", jsonRequest); Assert.assertNotNull(jsonResp); } @@ -81,7 +79,7 @@ public class AlertsIntegrationTest { @Test public void testGetAlertSources() throws Exception { JSONObject jsonRequest = new JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAlertSources\",\"id\":2}"); - JSONObject jsonResp = callService ("http://localhost:8080/demo-alert-aggregator-webapp/AlertsSourcesServiceJSONRPC", + JSONObject jsonResp = callService ("http://localhost:8085/demo-alert-aggregator-webapp/AlertsSourcesServiceJSONRPC", jsonRequest); Assert.assertEquals("BBC News", jsonResp.getJSONObject("result").getJSONObject("source").optJSONArray("list").getJSONObject(0).getString("name")); } |