Author: lresende
Date: Wed Apr 2 18:21:07 2008
New Revision: 644130
URL: http://svn.apache.org/viewvc?rev=644130&view=rev
Log:
Reverting latest changes to properly work in webapp applications.
Modified:
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/README
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/pom.xml
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/webapp/service.smd
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
Modified:
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/README
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/README?rev=644130&r1=644129&r2=644130&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/README
(original)
+++
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/README
Wed Apr 2 18:21:07 2008
@@ -25,7 +25,7 @@
Once deployed point your browser at
-http://localhost:8085/demo-alert-aggregator-webapp
+http://localhost:8080/demo-alert-aggregator-webapp
Taking care to ensure the host name and port number match you local
configuration.
@@ -66,7 +66,7 @@
favourite feed reader to read the aggregated alerts. To do this point your
feed reader at
-http://localhost:8085/demo-alert-aggregator-webapp/services/AlertsFeedServiceRSS
+http://localhost:8080/demo-alert-aggregator-webapp/services/AlertsFeedServiceRSS
Again taking care to ensure that the host name and port number match you
local configuration.
Modified:
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/pom.xml?rev=644130&r1=644129&r2=644130&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/pom.xml
(original)
+++
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/pom.xml
Wed Apr 2 18:21:07 2008
@@ -308,14 +308,14 @@
<wait>false</wait>
<configuration>
<properties>
- <cargo.servlet.port>8085</cargo.servlet.port>
+ <cargo.servlet.port>8080</cargo.servlet.port>
</properties>
<deployables>
<deployable>
<location>
${project.build.directory}/${project.build.finalName}.${project.packaging}
</location>
-
<pingURL>http://localhost:8085/AlertsSourcesServiceJSONRPC</pingURL>
+
<pingURL>http://localhost:8080/AlertsSourcesServiceJSONRPC</pingURL>
</deployable>
</deployables>
<home>${project.build.directory}/cargo-jetty</home>
Modified:
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl?rev=644130&r1=644129&r2=644130&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
(original)
+++
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
Wed Apr 2 18:21:07 2008
@@ -81,7 +81,7 @@
<wsdl:service name="AlertsService">
<wsdl:port name="AlertsPort" binding="tns:AlertsBinding">
- <wsdlsoap:address
location="http://localhost:8085/services/AlertsServiceWebServiceBinding"; />
+ <wsdlsoap:address
location="http://localhost:8080/services/AlertsServiceWebServiceBinding"; />
</wsdl:port>
</wsdl:service>
Modified:
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl?rev=644130&r1=644129&r2=644130&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
(original)
+++
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
Wed Apr 2 18:21:07 2008
@@ -117,7 +117,7 @@
<wsdl:service name="AlertsSourcesService">
<wsdl:port name="AlertsSourcesPort" binding="tns:AlertsSourcesBinding">
- <wsdlsoap:address
location="http://localhost:8085/services/AlertsSourcesServiceWebServiceBinding";
/>
+ <wsdlsoap:address
location="http://localhost:8080/services/AlertsSourcesServiceWebServiceBinding";
/>
</wsdl:port>
</wsdl:service>
Modified:
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/webapp/service.smd
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/webapp/service.smd?rev=644130&r1=644129&r2=644130&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/webapp/service.smd
(original)
+++
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/main/webapp/service.smd
Wed Apr 2 18:21:07 2008
@@ -1 +1 @@
-{"SMDVersion":".1","objectName":"AlertsService","serviceType":"JSON-RPC","serviceURL":"http://localhost:8085/sample-feed-aggregator/services/AlertsServiceJSONRPC","methods":[{"name":"getAllNewAlerts","parameters":[{"name":"param0","type":"STRING"}]}]}
+{"SMDVersion":".1","objectName":"AlertsService","serviceType":"JSON-RPC","serviceURL":"http://localhost:8080/sample-feed-aggregator/services/AlertsServiceJSONRPC","methods":[{"name":"getAllNewAlerts","parameters":[{"name":"param0","type":"STRING"}]}]}
Modified:
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java?rev=644130&r1=644129&r2=644130&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
(original)
+++
incubator/tuscany/branches/sca-java-1.2/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
Wed Apr 2 18:21:07 2008
@@ -65,7 +65,7 @@
@Test
public void testGetAllNewAlerts() throws Exception {
JSONObject jsonRequest = new
JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAllNewAlerts\",\"id\":2}");
- JSONObject jsonResp = callService
("http://localhost:8085/demo-alert-aggregator-webapp/AlertsServiceJSONRPC";,
+ JSONObject jsonResp = callService
("http://localhost:8080/demo-alert-aggregator-webapp/AlertsServiceJSONRPC";,
jsonRequest);
Assert.assertNotNull(jsonResp);
}
@@ -73,7 +73,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:8085/demo-alert-aggregator-webapp/AlertsSourcesServiceJSONRPC";,
+ JSONObject jsonResp = callService
("http://localhost:8080/demo-alert-aggregator-webapp/AlertsSourcesServiceJSONRPC";,
jsonRequest);
Assert.assertNotNull(jsonResp);
}
@@ -81,7 +81,7 @@
@Test
public void testGetAlertSources() throws Exception {
JSONObject jsonRequest = new
JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAlertSources\",\"id\":2}");
- JSONObject jsonResp = callService
("http://localhost:8085/demo-alert-aggregator-webapp/AlertsSourcesServiceJSONRPC";,
+ JSONObject jsonResp = callService
("http://localhost:8080/demo-alert-aggregator-webapp/AlertsSourcesServiceJSONRPC";,
jsonRequest);
Assert.assertEquals("BBC News",
jsonResp.getJSONObject("result").getJSONObject("source").optJSONArray("list").getJSONObject(0).getString("name"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
