svn commit: r1428979 - in /airavata/trunk/modules: integration-tests/pom.xml rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java

[samindaw]

Author: samindaw
Date: Fri Jan  4 16:58:44 2013
New Revision: 1428979

URL: http://svn.apache.org/viewvc?rev=1428979&view=rev
Log:
temporary fix for experimentdata interface not picking up the impl

Modified:
    airavata/trunk/modules/integration-tests/pom.xml
    
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java

Modified: airavata/trunk/modules/integration-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/pom.xml?rev=1428979&r1=1428978&r2=1428979&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Fri Jan  4 16:58:44 2013
@@ -380,15 +380,59 @@
             <scope>test</scope>
         </dependency>
                <dependency>
-                       <groupId>com.sun.jersey</groupId>
+                       <scope>test</scope>
+                       <groupId>com.sun.jersey</groupId>
                        <artifactId>jersey-json</artifactId>
                        <version>${jersey.version}</version>
                </dependency>
                <dependency>
-                       <groupId>com.sun.jersey</groupId>
+                       <scope>test</scope>
+                       <groupId>com.sun.jersey</groupId>
                        <artifactId>jersey-client</artifactId>
                        <version>${jersey.version}</version>
                </dependency>
+        <dependency>
+                       <scope>test</scope>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-multipart</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+                       <scope>test</scope>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
+                       <scope>test</scope>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-xc</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
+                       <scope>test</scope>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
+                       <scope>test</scope>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
+                       <scope>test</scope>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.2.3-1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.2.2</version>
+                       <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <properties>

Modified: 
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1428979&r1=1428978&r2=1428979&view=diff
==============================================================================
--- 
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
 (original)
+++ 
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
 Fri Jan  4 16:58:44 2013
@@ -35,6 +35,7 @@ import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriBuilder;
 
 import org.apache.airavata.registry.api.PasswordCallback;
+import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
 import org.apache.airavata.registry.api.impl.WorkflowExecutionDataImpl;
 import org.apache.airavata.registry.api.workflow.ExperimentData;
 import org.apache.airavata.registry.api.workflow.NodeExecutionData;
@@ -851,7 +852,7 @@ public class ProvenanceResourceClient {
                     + status);
         }
 
-        ExperimentData experimentData = 
response.getEntity(ExperimentData.class);
+        ExperimentData experimentData = 
response.getEntity(ExperimentDataImpl.class);
         return experimentData;
     }