From 6198a25e32e45a0a9295c50324de85aa2327a79f Mon Sep 17 00:00:00 2001 From: rfeng Date: Tue, 5 Aug 2008 06:55:40 +0000 Subject: Change the port to 8085 to avoid build break on the Apache continumm machine git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@682606 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/demos/alert-aggregator-webapp/pom.xml | 5 +++-- .../demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl | 2 +- .../alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl | 2 +- .../sca/demos/alert-aggregator-webapp/src/main/webapp/service.smd | 2 +- .../tuscany/sca/demos/aggregator/AlertsIntegrationTest.java | 8 +++----- 5 files changed, 9 insertions(+), 10 deletions(-) (limited to 'java/sca/demos') 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 @@ org.codehaus.cargo cargo-maven2-plugin + 1.0-alpha-5 start-container @@ -308,14 +309,14 @@ false - 8080 + 8085 ${project.build.directory}/${project.build.finalName}.${project.packaging} - http://localhost:8080/AlertsSourcesServiceJSONRPC + http://localhost:8085/AlertsSourcesServiceJSONRPC ${project.build.directory}/cargo-jetty 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 @@ - + 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 @@ - + 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")); } -- cgit v1.2.3