tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r682606 - in /tuscany/java/sca/demos/alert-aggregator-webapp: ./ src/main/resources/ src/main/webapp/ src/test/java/org/apache/tuscany/sca/demos/aggregator/
Date Tue, 05 Aug 2008 06:55:40 GMT
Author: rfeng
Date: Mon Aug  4 23:55:40 2008
New Revision: 682606

URL: http://svn.apache.org/viewvc?rev=682606&view=rev
Log:
Change the port to 8085 to avoid build break on the Apache continumm machine

Modified:
    tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml
    tuscany/java/sca/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
    tuscany/java/sca/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
    tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/service.smd
    tuscany/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java

Modified: tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml?rev=682606&r1=682605&r2=682606&view=diff
==============================================================================
--- tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml (original)
+++ tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml Mon Aug  4 23:55:40 2008
@@ -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>

Modified: tuscany/java/sca/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
URL: http://svn.apache.org/viewvc/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl?rev=682606&r1=682605&r2=682606&view=diff
==============================================================================
--- tuscany/java/sca/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl (original)
+++ tuscany/java/sca/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl Mon Aug
 4 23:55:40 2008
@@ -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>
 

Modified: tuscany/java/sca/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
URL: http://svn.apache.org/viewvc/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl?rev=682606&r1=682605&r2=682606&view=diff
==============================================================================
--- tuscany/java/sca/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl (original)
+++ tuscany/java/sca/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl Mon
Aug  4 23:55:40 2008
@@ -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>
 

Modified: tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/service.smd
URL: http://svn.apache.org/viewvc/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/service.smd?rev=682606&r1=682605&r2=682606&view=diff
==============================================================================
--- tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/service.smd (original)
+++ tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/service.smd Mon Aug  4
23:55:40 2008
@@ -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"}]}]}

Modified: tuscany/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java?rev=682606&r1=682605&r2=682606&view=diff
==============================================================================
--- tuscany/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
(original)
+++ tuscany/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
Mon Aug  4 23:55:40 2008
@@ -22,9 +22,7 @@
 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 @@
     @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 @@
     @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 @@
     @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"));

     }    



Mime
View raw message