You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/01/01 17:52:26 UTC
svn commit: r607872 - in
/incubator/tuscany/java/sca/demos/alert-aggregator-webapp: build.xml pom.xml
src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
Author: slaws
Date: Tue Jan 1 08:52:25 2008
New Revision: 607872
URL: http://svn.apache.org/viewvc?rev=607872&view=rev
Log:
Fix dependency versions. Change ant build to rely on automatically generated dependency file
Modified:
incubator/tuscany/java/sca/demos/alert-aggregator-webapp/build.xml
incubator/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml
incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
Modified: incubator/tuscany/java/sca/demos/alert-aggregator-webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator-webapp/build.xml?rev=607872&r1=607871&r2=607872&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator-webapp/build.xml (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator-webapp/build.xml Tue Jan 1 08:52:25 2008
@@ -16,7 +16,13 @@
* specific language governing permissions and limitations
* under the License.
-->
+<!DOCTYPE project [
+<!ENTITY buildDependency SYSTEM "build-dependency.xml">
+]>
+
<project name="helloworld-jsonrpc" default="package">
+ &buildDependency;
+
<property name="settings.localRepository" value="./target/repo" />
<property name="artifactId" value="sample-feed-aggregator" />
@@ -123,96 +129,8 @@
<war destfile="target/demo-alert-aggregator-webapp.war"
webxml="src/main/webapp/WEB-INF/web.xml">
<fileset dir="src/main/webapp"/>
- <zipfileset dir="../../modules" prefix="WEB-INF/lib">
- <include name="sca-api-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-feed-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-axis2-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-axiom-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-sdo-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-distributed-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-extension-helper-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-runtime-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-xml-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="../../lib">
- <include name="XmlSchema-1.3.1.jar"/>
- <include name="activation-1.1.jar"/>
- <include name="annogen-0.1.0.jar"/>
- <include name="ant-1.7.0.jar"/>
- <include name="ant-launcher-1.7.0.jar"/>
- <include name="axiom-api-1.2.4.jar"/>
- <include name="axiom-dom-1.2.4.jar"/>
- <include name="axiom-impl-1.2.4.jar"/>
- <include name="axis2-java2wsdl-1.2.jar"/>
- <include name="axis2-kernel-1.2.jar"/>
- <include name="backport-util-concurrent-2.2.jar"/>
- <include name="backport-util-concurrent-3.0.jar"/>
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="common-2.2.3.jar"/>
- <include name="commons-codec-1.3.jar"/>
- <include name="commons-fileupload-1.1.1.jar"/>
- <include name="commons-httpclient-3.0.1.jar"/>
- <include name="commons-io-1.1.jar"/>
- <include name="commons-logging-1.1.jar"/>
- <include name="ecore-2.2.3.jar"/>
- <include name="ecore-change-2.2.3.jar"/>
- <include name="ecore-xmi-2.2.3.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="geronimo-jms_1.1_spec-1.1.jar"/>
- <include name="jakarta-httpcore-4.0-alpha4.jar"/>
- <include name="jaxb-api-2.1.jar"/>
- <include name="jaxb-impl-2.1.4.jar"/>
- <include name="jaxen-1.1-beta-9.jar"/>
- <include name="jaxws-api-2.1.jar"/>
- <include name="jdom-1.0.jar"/>
- <include name="json-rpc-1.0.jar"/>
- <include name="jsr181-api-1.0-MR1.jar"/>
- <include name="jsr250-api-1.0.jar"/>
- <include name="mail-1.4.jar"/>
- <include name="neethi-2.0.1.jar"/>
- <include name="rome-0.9.jar"/>
- <include name="saaj-api-1.3.jar"/>
- <include name="sca-api-1.1-incubating-SNAPSHOT.jar"/>
- <include name="stax-api-1.0-2.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="woden-1.0-incubating-M7a.jar"/>
- <include name="wsdl4j-1.6.2.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- <include name="xercesImpl-2.8.1.jar"/>
- <include name="xml-apis-1.3.03.jar"/>
- <include name="xsd-2.2.3.jar"/>
- <include name="tuscany-sdo-api-r2.1-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-sdo-impl-1.1-incubating-SNAPSHOT.jar"/>
- <include name="tuscany-sdo-lib-1.1-incubating-SNAPSHOT.jar"/>
- </lib>
+ <lib refid="tuscany.jars"/>
+ <lib refid="3rdparty.jars"/>
<classes dir="target/classes"/>
</war>
Modified: incubator/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml?rev=607872&r1=607871&r2=607872&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator-webapp/pom.xml Tue Jan 1 08:52:25 2008
@@ -39,7 +39,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -101,18 +101,11 @@
<version>${pom.version}</version>
<scope>compile</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
- -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-webapp</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -131,6 +124,12 @@
<artifactId>rome</artifactId>
<version>0.9</version>
</dependency>
+ <!--dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency-->
</dependencies>
<build>
@@ -275,7 +274,6 @@
</executions>
</plugin>
-
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
@@ -298,7 +296,10 @@
<configuration>
<container>
<containerId>jetty6x</containerId>
- <type>embedded</type>
+ <type>embedded</type>
+ <systemProperties>
+ <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
+ </systemProperties>
</container>
<wait>false</wait>
<configuration>
@@ -314,8 +315,24 @@
</deployable>
</deployables>
</configuration>
- </configuration>
+ </configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+ <buildDependencyFileOnly>true</buildDependencyFileOnly>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java?rev=607872&r1=607871&r2=607872&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java Tue Jan 1 08:52:25 2008
@@ -21,10 +21,14 @@
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;
+import org.junit.Test;
import com.meterware.httpunit.PostMethodWebRequest;
import com.meterware.httpunit.WebConversation;
@@ -34,23 +38,20 @@
/**
*/
-public class AlertsIntegrationTest extends TestCase {
- private SCADomain scaDomain;
- /**
- * Runs before each test method
- */
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("alerts-client.composite");
- super.setUp();
+public class AlertsIntegrationTest {
+ //private static SCADomain scaDomain;
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ //scaDomain = SCADomain.newInstance("alerts.composite");
}
/**
* Runs after each test method
*/
- @Override
- protected void tearDown() {
- scaDomain.close();
+ @AfterClass
+ public static void tearDown() {
+ //scaDomain.close();
}
/* Use this if you want to test locally without deploying to a web container
@@ -61,25 +62,28 @@
}
*/
+ @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",
jsonRequest);
- assertNotNull(jsonResp);
+ Assert.assertNotNull(jsonResp);
}
+ @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",
jsonRequest);
- assertNotNull(jsonResp);
+ Assert.assertNotNull(jsonResp);
}
+ @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",
jsonRequest);
- assertEquals("BBC News", jsonResp.getJSONObject("result").getJSONObject("source").optJSONArray("list").getJSONObject(0).getString("name"));
+ Assert.assertEquals("BBC News", jsonResp.getJSONObject("result").getJSONObject("source").optJSONArray("list").getJSONObject(0).getString("name"));
}
public JSONObject callService(String url, JSONObject jsonRequest) throws Exception {
@@ -89,7 +93,7 @@
new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")),"application/json");
WebResponse response = wc.getResource(request);
System.out.println("Response= " + response.getText());
- assertEquals(200, response.getResponseCode());
+ Assert.assertEquals(200, response.getResponseCode());
return new JSONObject(response.getText());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org