You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/10/16 22:04:28 UTC
svn commit: r1398964 [1/3] - in /airavata/trunk/modules: registry/
registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/
registry/airavata-registry-test/ registry/airavata-registry-test/src/
registry/airav...
Author: chathuri
Date: Tue Oct 16 20:04:27 2012
New Revision: 1398964
URL: http://svn.apache.org/viewvc?rev=1398964&view=rev
Log:
adding test for registry api
Added:
airavata/trunk/modules/registry/airavata-registry-test/
airavata/trunk/modules/registry/airavata-registry-test/pom.xml
airavata/trunk/modules/registry/airavata-registry-test/src/
airavata/trunk/modules/registry/airavata-registry-test/src/main/
airavata/trunk/modules/registry/airavata-registry-test/src/main/java/
airavata/trunk/modules/registry/airavata-registry-test/src/main/resources/
airavata/trunk/modules/registry/airavata-registry-test/src/test/
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/
airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/util/Initialize.java
airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/
airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/repository.properties
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
airavata/trunk/modules/registry/pom.xml
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/Monitor.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java?rev=1398964&r1=1398963&r2=1398964&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataRetriever.java Tue Oct 16 20:04:27 2012
@@ -49,7 +49,7 @@ public class ExperimentDataRetriever {
Class.forName(Utils.getJDBCDriver()).newInstance();
connection = DriverManager.getConnection(connectionURL, Utils.getJDBCUser(), Utils.getJDBCPassword());
statement = connection.createStatement();
- String queryString = "SELECT ed.experiment_ID, ed.name, ed.username, em.metadata, " +
+ String queryString = "SELECT e.experiment_ID, ed.name, ed.username, em.metadata, " +
"wd.workflow_instanceID, wd.template_name, wd.status, wd.start_time," +
"wd.last_update_time, nd.node_id, nd.inputs, nd.outputs, " +
"e.project_name, e.submitted_date, nd.node_type, nd.status," +
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java?rev=1398964&r1=1398963&r2=1398964&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java Tue Oct 16 20:04:27 2012
@@ -366,6 +366,7 @@ public class Utils {
ProjectResource projectResource = (ProjectResource)createProject(o.getProject());
experimentResource.setProject(projectResource);
experimentResource.setExpID(o.getExperiment_ID());
+ experimentResource.setSubmittedDate(o.getSubmitted_date());
return experimentResource;
}
Added: airavata/trunk/modules/registry/airavata-registry-test/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/pom.xml?rev=1398964&view=auto
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-test/pom.xml (added)
+++ airavata/trunk/modules/registry/airavata-registry-test/pom.xml Tue Oct 16 20:04:27 2012
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>registry</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>airavata-registry-test</artifactId>
+ <packaging>jar</packaging>
+ <name>Airavata Registry Test</name>
+ <url>http://airavata.apache.org/</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-gfac-schema-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-common-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-registry-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!--dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.6</version>
+ </dependency-->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-jpa-registry</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-workflow-model-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!--dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-registry-service</artifactId>
+ <version>${project.version}</version>
+ </dependency-->
+
+ </dependencies>
+
+</project>