airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1421315 - in /airavata/trunk/modules: integration-tests/pom.xml integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java rest/webapp/pom.xml
Date Thu, 13 Dec 2012 14:36:49 GMT
Author: chathuri
Date: Thu Dec 13 14:36:48 2012
New Revision: 1421315

URL: http://svn.apache.org/viewvc?rev=1421315&view=rev
Log:
add missing dependency for REST web app

Modified:
    airavata/trunk/modules/integration-tests/pom.xml
    airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
    airavata/trunk/modules/rest/webapp/pom.xml

Modified: airavata/trunk/modules/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/pom.xml?rev=1421315&r1=1421314&r2=1421315&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Thu Dec 13 14:36:48 2012
@@ -233,7 +233,7 @@
                     <deployables>
                         <deployable>
                             <groupId>org.apache.airavata</groupId>
-                            <artifactId>airavata-rest-services</artifactId>
+                            <artifactId>airavata-rest-service-webapp</artifactId>
                             <type>war</type>
                             <properties>
                                 <context>/${rest.service.context}</context>
@@ -359,7 +359,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-rest-services</artifactId>
+            <artifactId>airavata-rest-service-webapp</artifactId>
             <type>war</type>
             <version>${project.version}</version>
             <exclusions>
@@ -394,6 +394,17 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-jpa-registry</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-client-api</artifactId>
             <version>${project.version}</version>
             <exclusions>

Modified: airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java?rev=1421315&r1=1421314&r2=1421315&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
(original)
+++ airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
Thu Dec 13 14:36:48 2012
@@ -3,6 +3,7 @@ package org.apache.airavata.integration;
 import junit.framework.Assert;
 import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.registry.api.workflow.ExperimentData;
+import org.apache.airavata.registry.api.impl.WorkflowInstanceDataImpl;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceData;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeData;
 import org.apache.airavata.ws.monitor.MonitorEvent;
@@ -54,9 +55,11 @@ public class TestMonitorListener impleme
 
         log.info("Verifying output ...");
 
-        List<WorkflowInstanceData> workflowInstanceData = experimentData.getWorkflowInstanceData();
+        List<WorkflowInstanceDataImpl> workflowInstanceData = experimentData.getWorkflowInstanceData();
 
-        for(WorkflowInstanceData data:workflowInstanceData){
+//        List<WorkflowInstanceData> workflowInstanceData = experimentData.getWorkflowInstanceData();
+
+        for(WorkflowInstanceDataImpl data:workflowInstanceData){
             List<WorkflowInstanceNodeData> nodeDataList = data.getNodeDataList();
             for(WorkflowInstanceNodeData nodeData:nodeDataList){
                 Assert.assertEquals("Airavata Test", nodeData.getOutputData().get(0).getValue());

Modified: airavata/trunk/modules/rest/webapp/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/pom.xml?rev=1421315&r1=1421314&r2=1421315&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/pom.xml (original)
+++ airavata/trunk/modules/rest/webapp/pom.xml Thu Dec 13 14:36:48 2012
@@ -167,12 +167,12 @@
 			<groupId>org.apache.airavata</groupId>
 			<artifactId>airavata-security</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency-->
 		<dependency>
 			<groupId>org.apache.airavata</groupId>
 			<artifactId>airavata-jpa-registry</artifactId>
 			<version>${project.version}</version>
-		</dependency-->
+		</dependency>
 		<dependency>
 			<groupId>org.apache.airavata</groupId>
 			<artifactId>airavata-rest-mappings</artifactId>



Mime
View raw message