You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/12/10 22:39:50 UTC
svn commit: r1419801 [1/2] - in /airavata/trunk: ./
modules/commons/utils/src/main/java/org/apache/airavata/common/context/
modules/integration-tests/ modules/integration-tests/src/
modules/integration-tests/src/main/ modules/integration-tests/src/main...
Author: lahiru
Date: Mon Dec 10 21:39:46 2012
New Revision: 1419801
URL: http://svn.apache.org/viewvc?rev=1419801&view=rev
Log:
Adding integration test, thanks amila for contribution.
Added:
airavata/trunk/modules/integration-tests/
airavata/trunk/modules/integration-tests/derby-start.txt
airavata/trunk/modules/integration-tests/derby-stop.txt
airavata/trunk/modules/integration-tests/pom.xml
airavata/trunk/modules/integration-tests/src/
airavata/trunk/modules/integration-tests/src/main/
airavata/trunk/modules/integration-tests/src/main/java/
airavata/trunk/modules/integration-tests/src/main/java/org/
airavata/trunk/modules/integration-tests/src/main/java/org/apache/
airavata/trunk/modules/integration-tests/src/main/java/org/apache/airavata/
airavata/trunk/modules/integration-tests/src/main/java/org/apache/airavata/integration/
airavata/trunk/modules/integration-tests/src/main/java/org/apache/airavata/integration/Man.java
airavata/trunk/modules/integration-tests/src/main/resources/
airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh (with props)
airavata/trunk/modules/integration-tests/src/test/
airavata/trunk/modules/integration-tests/src/test/java/
airavata/trunk/modules/integration-tests/src/test/java/org/
airavata/trunk/modules/integration-tests/src/test/java/org/apache/
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/DummyTestCase.java
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/PasswordCallbackImpl.java
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
airavata/trunk/modules/integration-tests/src/test/java/suite.xml
airavata/trunk/modules/integration-tests/src/test/resources/
airavata/trunk/modules/integration-tests/src/test/resources/EchoWorkflow.xwf
airavata/trunk/modules/integration-tests/src/test/resources/log4j.properties
airavata/trunk/modules/integration-tests/src/test/resources/registry.properties
airavata/trunk/modules/integration-tests/tomcat-distribution.iml
Modified:
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/context/WorkflowContext.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/HttpAuthenticatorFilter.java
airavata/trunk/pom.xml
Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/context/WorkflowContext.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/context/WorkflowContext.java?rev=1419801&r1=1419800&r2=1419801&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/context/WorkflowContext.java (original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/context/WorkflowContext.java Mon Dec 10 21:39:46 2012
@@ -8,7 +8,7 @@ package org.apache.airavata.common.conte
*/
public class WorkflowContext {
- private static final ThreadLocal userThreadLocal = new ThreadLocal();
+ private static final ThreadLocal userThreadLocal = new InheritableThreadLocal();
/**
* Sets the context.
Added: airavata/trunk/modules/integration-tests/derby-start.txt
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/derby-start.txt?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/derby-start.txt (added)
+++ airavata/trunk/modules/integration-tests/derby-start.txt Mon Dec 10 21:39:46 2012
@@ -0,0 +1 @@
+./derby.sh: line 22: cd: /Users/thejaka/development/apache/airavata/trunk-integration/modules/integration-tests/target/tests/apache-tomcat-7.0.33/webapps/axis2/WEB-INF/bin: No such file or directory
Added: airavata/trunk/modules/integration-tests/derby-stop.txt
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/derby-stop.txt?rev=1419801&view=auto
==============================================================================
(empty)
Added: airavata/trunk/modules/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/pom.xml?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (added)
+++ airavata/trunk/modules/integration-tests/pom.xml Mon Dec 10 21:39:46 2012
@@ -0,0 +1,442 @@
+<?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>airavata</artifactId>
+ <version>0.6-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>tomcat-distribution</artifactId>
+ <name>tomcat-distribution</name>
+ <url>http://airavata.apache.org/</url>
+
+ <build>
+ <plugins>
+ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>unpack-tomcat</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>binary-distribution</artifactId>
+ <version>7.0.33</version>
+ <type>zip</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/tests</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin-->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>delete-tomcat-example</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <get dest=".">
+ <url url="http://archive.apache.org/dist/tomcat/tomcat-${major.tomcat.version}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip"/>
+ </get>
+ <unzip src="../distribution/airavata-server/target/apache-airavata-server-${project.version}-bin.zip" dest="target/tests"/>
+ <unzip src="../distribution/xbaya-gui/target/apache-airavata-xbaya-gui-${project.version}-bin.zip" dest="target/tests"/>
+ <unzip src="apache-tomcat-${tomcat.version}.zip" dest="target/tests"/>
+ <delete dir="${tomcat.work.dir}/webapps/examples"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>unpack-axis2</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-webapp</artifactId>
+ <version>${axis2.version}</version>
+ <type>war</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${tomcat.work.dir}/webapps/axis2</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-files</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF">
+ <fileset dir="${airavata.work.dir}/repository/"/>
+ </copy>
+ <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF/lib">
+ <fileset dir="${airavata.work.dir}/lib/">
+ <exclude name="tomcat-*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF/classes">
+ <fileset dir="${airavata.work.dir}/bin/">
+ <exclude name="axis2.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF/lib">
+ <fileset dir="${airavata.work.dir}/bin/">
+ <include name="*.properties"/>
+ <include name="authenticators.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="src/test/resources" overwrite="true">
+ <fileset dir="${xbaya.work.dir}/bin/">
+ <include name="registry.properties"/>
+ </fileset>
+ </copy>
+ <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF/classes/database_scripts">
+ <fileset dir="${airavata.work.dir}/bin/database_scripts"/>
+ </copy>
+ <chmod dir="${tomcat.work.dir}/bin" perm="700"
+ includes="*.sh"/>
+ <chmod dir="${tomcat.work.dir}/webapps/axis2" perm="700"
+ includes="**/*"/>
+ <mkdir dir="${derby.work.dir}"/>
+ <copy todir="${derby.work.dir}">
+ <fileset dir="${airavata.work.dir}/bin/">
+ <include name="derby.sh"/>
+ <include name="setenv.sh"/>
+ <include name="startNetworkServer"/>
+ </fileset>
+ </copy>
+ <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF/derby-bin">
+ <fileset dir="src/main/resources">
+ <include name="stop-derby.sh"/>
+ </fileset>
+ </copy>
+ <replace file="${derby.work.dir}/derby.sh">
+ <replacetoken>export DERBY_HOME=$AIRAVATA_HOME/standalone-server</replacetoken>
+ <replacevalue>export DERBY_HOME=..</replacevalue>
+ </replace>
+ <replace file="${derby.work.dir}/derby.sh">
+ <replacetoken>./startNetworkServer $*</replacetoken>
+ <replacevalue>./startNetworkServer $* &</replacevalue>
+ </replace>
+ <replace file="${tomcat.work.dir}/conf/server.xml">
+ <replacetoken>8080</replacetoken>
+ <replacevalue>${test.running.port}</replacevalue>
+ </replace>
+ <chmod dir="${derby.work.dir}" perm="700"
+ includes="*"/>
+
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>start-derby</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <exec dir="${derby.work.dir}" executable="./stop-derby.sh" output="derby-stop.txt" />
+ <exec dir="${derby.work.dir}" executable="./derby.sh" output="derby-start.txt"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.3.1</version>
+ <configuration>
+ <!--wait>true</wait-->
+
+ <container>
+ <containerId>tomcat${major.tomcat.version}x</containerId>
+ <type>installed</type>
+ <home>${tomcat.work.dir}</home>
+ </container>
+
+ <configuration>
+ <properties>
+ <cargo.servlet.port>${test.running.port}</cargo.servlet.port>
+ <cargo.tomcat.ajp.port>9009</cargo.tomcat.ajp.port>
+ <cargo.rmi.port>9099</cargo.rmi.port>
+ <!--cargo.jvmargs>
+ -Xdebug
+ -Xrunjdwp:transport=dt_socket,server=y,suspend=${cargo.debug.suspend},address=${cargo.debug.address}
+ -Xnoagent
+ -Djava.compiler=NONE
+ </cargo.jvmargs-->
+ <!--cargo.jvmargs>
+ <![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend} -noverify]]>
+ </cargo.jvmargs-->
+ <cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
+ </properties>
+ <type>existing</type>
+ <home>${tomcat.work.dir}</home>
+
+ </configuration>
+ <deployables>
+ <deployable>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-rest-services</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/${rest.service.context}</context>
+ </properties>
+ </deployable>
+ </deployables>
+
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>compile</phase>
+ <goals>
+ <!--goal>deployer-deploy</goal-->
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <!--suiteXmlFiles>
+ <suiteXmlFile>testng.xml</suiteXmlFile>
+ </suiteXmlFiles-->
+ <failIfNoTests>false</failIfNoTests>
+ <systemPropertyVariables>
+ <test.server.port>${test.running.port}</test.server.port>
+ <test.server.url>localhost</test.server.url>
+ <test.server.context>${rest.service.context}</test.server.context>
+ <log4j.configuration>file:${basedir}/src/test/resources/log4j.properties</log4j.configuration>
+ <property>
+ <name>log4j.configuration</name>
+ <value>file:target/test-classes/log4j.properties</value>
+ </property>
+ </systemPropertyVariables>
+
+ <includes>
+ <include>**/*IT.java</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>stop-derby</id>
+ <phase>install</phase>
+ <configuration>
+ <target>
+ <exec dir="${derby.work.dir}" executable="./stop-derby.sh" output="derby-stop.txt" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomcat-zip</id>
+ <phase>install</phase>
+ <configuration>
+ <target>
+ <echo message="Creating airavata tomcat distribution. This may take a while ..."/>
+ <sleep seconds="20"/>
+ <zip destfile="${airavata.tomcat.distribution}"
+ basedir="${tomcat.work.dir}"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>distribution</artifactId>
+ <type>pom</type>
+ <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-rest-services</artifactId>
+ <type>war</type>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-webapp</artifactId>
+ <version>${axis2.version}</version>
+ <type>war</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-rest-client</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>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-registry-api</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <archieve.name>apache-airavata</archieve.name>
+ <used.axis2.release>${axis2.version}</used.axis2.release>
+ <major.tomcat.version>7</major.tomcat.version>
+ <cargo.debug.address>8000</cargo.debug.address>
+ <cargo.debug.suspend>y</cargo.debug.suspend>
+ <test.running.port>8080</test.running.port>
+ <tomcat.work.dir>target/tests/apache-tomcat-${tomcat.version}</tomcat.work.dir>
+ <airavata.work.dir>target/tests/apache-airavata-server-${project.version}</airavata.work.dir>
+ <xbaya.work.dir>target/tests/apache-airavata-xbaya-gui-${project.version}</xbaya.work.dir>
+ <derby.work.dir>${tomcat.work.dir}/webapps/axis2/WEB-INF/derby-bin</derby.work.dir>
+ <airavata.tomcat.distribution>target/apache-airavata-tomcat.zip</airavata.tomcat.distribution>
+ <rest.service.context>airavata-registry</rest.service.context>
+ </properties>
+</project>
Added: airavata/trunk/modules/integration-tests/src/main/java/org/apache/airavata/integration/Man.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/main/java/org/apache/airavata/integration/Man.java?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/src/main/java/org/apache/airavata/integration/Man.java (added)
+++ airavata/trunk/modules/integration-tests/src/main/java/org/apache/airavata/integration/Man.java Mon Dec 10 21:39:46 2012
@@ -0,0 +1,12 @@
+package org.apache.airavata.integration;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: thejaka
+ * Date: 11/30/12
+ * Time: 9:40 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class Man {
+
+}
Added: airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh (added)
+++ airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh Mon Dec 10 21:39:46 2012
@@ -0,0 +1,7 @@
+#!/bin/sh
+pid=$(ps -fe | grep '[d]erby' | awk '{print $2}')
+if [[ -n $pid ]]; then
+ kill -TERM $pid
+else
+ echo "Does not exist"
+fi
Propchange: airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh
------------------------------------------------------------------------------
svn:executable = *
Added: airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java (added)
+++ airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java Mon Dec 10 21:39:46 2012
@@ -0,0 +1,338 @@
+package org.apache.airavata.integration;
+
+import junit.framework.Assert;
+import org.apache.airavata.client.AiravataAPIFactory;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+import org.apache.airavata.common.utils.Version;
+import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.commons.gfac.type.ServiceDescription;
+import org.apache.airavata.registry.api.PasswordCallback;
+import org.apache.airavata.schemas.gfac.*;
+import org.apache.airavata.workflow.model.wf.Workflow;
+import org.apache.airavata.workflow.model.wf.WorkflowInput;
+import org.apache.airavata.ws.monitor.Monitor;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * Integration test class.
+ */
+public class BaseCaseIT {
+
+ private static final Logger log = LoggerFactory.getLogger(BaseCaseIT.class);
+
+ private static int port;
+ private static String serverUrl;
+ private static String serverContextName;
+
+ private static String registryURL;
+
+ private static String gatewayName = "default";
+ private static String userName = "admin";
+ private static String password = "admin";
+
+ private static final int TIME_OUT = 20000;
+
+ private static final int TRIES = 3;
+
+ private AiravataAPI airavataAPI;
+
+ protected static void log(String message) {
+ log.info(message);
+ }
+
+ public static Logger getLog() {
+ return log;
+ }
+
+ public static int getPort() {
+ return port;
+ }
+
+ public static String getServerUrl() {
+ return serverUrl;
+ }
+
+ public static String getServerContextName() {
+ return serverContextName;
+ }
+
+ public static String getRegistryURL() {
+ return registryURL;
+ }
+
+ public static String getGatewayName() {
+ return gatewayName;
+ }
+
+ public static String getUserName() {
+ return userName;
+ }
+
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
+ }
+
+ public static String getPassword() {
+ return password;
+ }
+
+ @BeforeClass
+ public static void setUpEnvironment() throws Exception{
+
+ log("..................Validating server logs .............................");
+ //TODO validate logs
+
+ log("Reading test server configurations ...");
+
+ String strPort = System.getProperty("test.server.port");
+
+ if (strPort == null) {
+ strPort = "8080";
+ }
+
+ String strHost = System.getProperty("test.server.url");
+
+ if (strHost == null) {
+ strHost = "localhost";
+ }
+
+ String strContext = System.getProperty("test.server.context");
+
+ if (strContext == null) {
+ strContext = "airavata-registry";
+ }
+
+ port = Integer.parseInt(strPort);
+ serverUrl = strHost;
+ serverContextName = strContext;
+
+ log("Configurations - port : " + port);
+ log("Configurations - serverUrl : " + serverUrl);
+ log("Configurations - serverContext : " + serverContextName);
+
+ registryURL = "http://" + serverUrl + ":" + port + "/" + serverContextName + "/api";
+
+ log("Configurations - Registry URL : " + registryURL);
+
+
+ PasswordCallback passwordCallback = new PasswordCallbackImpl();
+ AiravataAPI airavataAPI = AiravataAPIFactory.getAPI(new URI(getRegistryURL()),
+ getGatewayName(), getUserName(), passwordCallback);
+
+ checkServerStartup(airavataAPI);
+
+
+ log("Server successfully started .............................");
+ log("Running tests .............................");
+ }
+
+
+ protected static void checkServerStartup (AiravataAPI airavataAPI) throws Exception {
+
+ int tries = 0;
+
+ while (true) {
+
+ if (tries == TRIES) {
+ log("Server not responding. Cannot continue with integration tests ...");
+ throw new Exception("Server not responding !");
+ }
+
+ log("Checking server is running, try - " + tries);
+
+ URI eventingServiceURL = airavataAPI.getAiravataManager().getEventingServiceURL();
+
+ URI gFaCURL = airavataAPI.getAiravataManager().getGFaCURL();
+
+ URI messageBoxServiceURL = airavataAPI.getAiravataManager().getMessageBoxServiceURL();
+
+ URI workflowInterpreterServiceURL = airavataAPI.getAiravataManager().getWorkflowInterpreterServiceURL();
+
+ if (eventingServiceURL == null ||
+ gFaCURL == null ||
+ messageBoxServiceURL == null ||
+ workflowInterpreterServiceURL == null) {
+
+ log.info("Waiting till server initializes ........");
+ Thread.sleep(TIME_OUT);
+ } else {
+ break;
+ }
+
+ ++tries;
+ }
+
+ }
+
+ @Before
+ public void setUp() throws Exception {
+
+ PasswordCallback passwordCallback = new PasswordCallbackImpl();
+ this.airavataAPI = AiravataAPIFactory.getAPI(new URI(getRegistryURL()),
+ getGatewayName(), getUserName(), passwordCallback);
+ }
+
+ @Test
+ public void testSetup() {
+
+ Version version = this.airavataAPI.getVersion();
+
+ Assert.assertNotNull(version);
+
+ log("Airavata version - " + version.getFullVersion());
+
+ }
+
+ @Test
+ public void testURLs() throws AiravataAPIInvocationException {
+ URI eventingServiceURL = this.airavataAPI.getAiravataManager().getEventingServiceURL();
+ Assert.assertNotNull(eventingServiceURL);
+
+ URI gFaCURL = this.airavataAPI.getAiravataManager().getGFaCURL();
+ Assert.assertNotNull(gFaCURL);
+
+ URI messageBoxServiceURL = this.airavataAPI.getAiravataManager().getMessageBoxServiceURL();
+ Assert.assertNotNull(messageBoxServiceURL);
+ }
+
+ @Test
+ public void testEchoService() throws Exception {
+ HostDescription hostDescription = new HostDescription(GlobusHostType.type);
+ hostDescription.getType().setHostName("localhost");
+ hostDescription.getType().setHostAddress("127.0.0.1");
+
+ log("Saving host description ....");
+ airavataAPI.getApplicationManager().saveHostDescription(hostDescription);
+
+ Assert.assertTrue(airavataAPI.getApplicationManager().isHostDescriptorExists(hostDescription.getType()
+ .getHostName()));
+
+ ServiceDescription serviceDescription = new ServiceDescription();
+ List<InputParameterType> inputParameters = new ArrayList<InputParameterType>();
+ List<OutputParameterType> outputParameters = new ArrayList<OutputParameterType>();
+ serviceDescription.getType().setName("Echo");
+ serviceDescription.getType().setDescription("Echo service");
+ InputParameterType parameter = InputParameterType.Factory.newInstance();
+ parameter.setParameterName("echo_input");
+ parameter.setParameterDescription("echo input");
+ ParameterType parameterType = parameter.addNewParameterType();
+ parameterType.setType(DataType.STRING);
+ parameterType.setName("String");
+ inputParameters.add(parameter);
+
+ OutputParameterType outputParameter = OutputParameterType.Factory.newInstance();
+ outputParameter.setParameterName("echo_output");
+ outputParameter.setParameterDescription("Echo output");
+ ParameterType outputParaType = outputParameter.addNewParameterType();
+ outputParaType.setType(DataType.STRING);
+ outputParaType.setName("String");
+ outputParameters.add(outputParameter);
+
+ serviceDescription.getType().setInputParametersArray(inputParameters.toArray(new InputParameterType[]{}));
+ serviceDescription.getType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[]{}));
+
+ log("Saving service description ...");
+ airavataAPI.getApplicationManager().saveServiceDescription(serviceDescription);
+ Assert.assertTrue(airavataAPI.getApplicationManager().isServiceDescriptorExists(serviceDescription.
+ getType().getName()));
+
+ // Deployment descriptor
+ ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription();
+ ApplicationDeploymentDescriptionType applicationDeploymentDescriptionType
+ = applicationDeploymentDescription.getType();
+ applicationDeploymentDescriptionType.addNewApplicationName().setStringValue("EchoApplication");
+ applicationDeploymentDescriptionType.setExecutableLocation("/bin/echo");
+ applicationDeploymentDescriptionType.setScratchWorkingDirectory("/tmp");
+
+ log("Saving deployment description ...");
+ airavataAPI.getApplicationManager().saveDeploymentDescription(serviceDescription.getType().getName(),
+ hostDescription.getType().getHostName(), applicationDeploymentDescription);
+ Assert.assertTrue(airavataAPI.getApplicationManager().isDeploymentDescriptorExists(serviceDescription.getType().
+ getName(), hostDescription.getType().getHostName(),
+ applicationDeploymentDescription.getType().getApplicationName().getStringValue()));
+
+ log("Saving workflow ...");
+ Workflow workflow = new Workflow(getWorkflowComposeContent("src/test/resources/EchoWorkflow.xwf"));
+ airavataAPI.getWorkflowManager().
+ saveWorkflow(workflow);
+
+ Assert.assertTrue(airavataAPI.getWorkflowManager().isWorkflowExists(workflow.getName()));
+
+ log("Workflow setting up completed ...");
+
+ runWorkFlow(workflow, Arrays.asList("echo_output=Airavata Test"));
+ }
+
+ protected void runWorkFlow(Workflow workflow, List<String> inputValues) throws Exception {
+
+ AiravataAPI airavataAPI = AiravataAPIFactory.getAPI(new URI(getRegistryURL()), getGatewayName(),
+ getUserName(), new PasswordCallbackImpl());
+ String workflowName = workflow.getName();
+ List<WorkflowInput> workflowInputs = airavataAPI.getWorkflowManager().getWorkflowInputs(workflowName);
+
+ Assert.assertEquals(workflowInputs.size(), inputValues.size());
+
+ int i = 0;
+ for (String valueString : inputValues) {
+ workflowInputs.get(i).setValue(valueString);
+ ++i;
+ }
+
+ String result
+ = airavataAPI.getExecutionManager().runExperiment(workflowName, workflowInputs, getUserName(), "",
+ workflowName);
+
+ Assert.assertNotNull(result);
+
+ log.info("Run workflow completed ....");
+ log.info("Starting monitoring ....");
+
+ monitor(result);
+
+ }
+
+ protected String getWorkflowComposeContent(String fileName) throws IOException {
+
+ File f = new File(".");
+ log.info(f.getAbsolutePath());
+
+ File echoWorkflow = new File(fileName);
+ if (!echoWorkflow.exists()) {
+ fileName = "modules/tomcat-distribution/src/test/resources/EchoWorkflow.xwf";
+ }
+
+ BufferedReader reader = new BufferedReader(new FileReader(fileName));
+ String line;
+ StringBuilder buffer = new StringBuilder();
+ while ((line = reader.readLine()) != null) {
+ buffer.append(line);
+ }
+
+ log.debug("Workflow compose - " + buffer.toString());
+ return buffer.toString();
+ }
+
+ public void monitor(String experimentId) throws Exception {
+ AiravataAPI airavataAPI = AiravataAPIFactory.getAPI(new URI(getRegistryURL()), getGatewayName(),
+ getUserName(), new PasswordCallbackImpl() );
+ Monitor experimentMonitor = airavataAPI.getExecutionManager().getExperimentMonitor(experimentId, // TODO what is experiment name ?
+ new TestMonitorListener(this.airavataAPI, experimentId));
+ experimentMonitor.startMonitoring();
+ }
+
+
+
+}
Added: airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/DummyTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/DummyTestCase.java?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/DummyTestCase.java (added)
+++ airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/DummyTestCase.java Mon Dec 10 21:39:46 2012
@@ -0,0 +1,18 @@
+package org.apache.airavata.integration;
+
+import junit.framework.TestCase;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: thejaka
+ * Date: 12/4/12
+ * Time: 11:55 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class DummyTestCase extends TestCase {
+
+ public void testIgnore() {
+ // Just to avoid junit failures
+ }
+
+}
Added: airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/PasswordCallbackImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/PasswordCallbackImpl.java?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/PasswordCallbackImpl.java (added)
+++ airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/PasswordCallbackImpl.java Mon Dec 10 21:39:46 2012
@@ -0,0 +1,18 @@
+package org.apache.airavata.integration;
+
+import org.apache.airavata.registry.api.PasswordCallback;
+
+/**
+ * Callback for tests
+ */
+public class PasswordCallbackImpl implements PasswordCallback {
+ @Override
+ public String getPassword(String username) {
+
+ if (username.equals("admin")) {
+ return "admin";
+ }
+
+ return null;
+ }
+}
Added: 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=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java (added)
+++ airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java Mon Dec 10 21:39:46 2012
@@ -0,0 +1,67 @@
+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.workflow.WorkflowInstanceData;
+import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeData;
+import org.apache.airavata.ws.monitor.MonitorEvent;
+import org.apache.airavata.ws.monitor.MonitorEventData;
+import org.apache.airavata.ws.monitor.MonitorEventListener;
+import org.apache.airavata.ws.monitor.MonitorUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+/**
+ * Monitor class for integration tests.
+ */
+public class TestMonitorListener implements MonitorEventListener {
+
+ private static final Logger log = LoggerFactory.getLogger(BaseCaseIT.class);
+
+ private String experimentId;
+ private AiravataAPI airavataAPI;
+
+ public TestMonitorListener(AiravataAPI api, String experiment) {
+ this.airavataAPI = api;
+ this.experimentId = experiment;
+ }
+
+ @Override
+ public void notify(MonitorEventData eventData, MonitorEvent event) {
+
+ Assert.assertNotNull(eventData);
+ Assert.assertNotNull(event);
+
+ if (MonitorUtil.EventType.WORKFLOW_TERMINATED == event.getType()) {
+ try {
+ verifyOutput("echo_output=Airavata Test");
+ } catch (Exception e) {
+ log.error("Error verifying output", e);
+ throw new RuntimeException(e);
+ }
+ }
+
+ log.info(eventData.getEvents().toString());
+ }
+
+ protected void verifyOutput(String outputVerifyingString) throws Exception {
+ log.info("Workflow Experiment ID Returned : " + this.experimentId);
+
+ ExperimentData experimentData = airavataAPI.getProvenanceManager().getExperimentData(this.experimentId);
+
+ log.info("Verifying output ...");
+
+ List<WorkflowInstanceData> workflowInstanceData = experimentData.getWorkflowInstanceData();
+
+ for(WorkflowInstanceData data:workflowInstanceData){
+ List<WorkflowInstanceNodeData> nodeDataList = data.getNodeDataList();
+ for(WorkflowInstanceNodeData nodeData:nodeDataList){
+ Assert.assertEquals("Airavata Test", nodeData.getOutputData().get(0).getValue());
+ Assert.assertEquals(outputVerifyingString, nodeData.getInputData().get(0).getValue());
+ }
+ }
+ }
+}
Added: airavata/trunk/modules/integration-tests/src/test/java/suite.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/suite.xml?rev=1419801&view=auto
==============================================================================
(empty)
Added: airavata/trunk/modules/integration-tests/src/test/resources/EchoWorkflow.xwf
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/resources/EchoWorkflow.xwf?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/resources/EchoWorkflow.xwf (added)
+++ airavata/trunk/modules/integration-tests/src/test/resources/EchoWorkflow.xwf Mon Dec 10 21:39:46 2012
@@ -0,0 +1,140 @@
+<?xml version="1.0"?><xwf:workflow xwf:version="0.5" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
+ <xgr:graph xgr:version="0.5" xgr:type="ws" xmlns:xgr="http://airavata.apache.org/xbaya/graph">
+ <xgr:id>Echo</xgr:id>
+ <xgr:name>Echo</xgr:name>
+ <xgr:description></xgr:description>
+ <xgr:metadata>
+ <appinfo xmlns="http://www.w3.org/2001/XMLSchema">
+
+</appinfo>
+ </xgr:metadata>
+ <xgr:node xgr:type="ws">
+ <xgr:id>Echo_invoke</xgr:id>
+ <xgr:name>Echo:invoke</xgr:name>
+ <xgr:outputPort>Echo_invoke_out_0</xgr:outputPort>
+ <xgr:inputPort>Echo_invoke_in_0</xgr:inputPort>
+ <xgr:controlInPort>Echo_invoke_ctrl_in_0</xgr:controlInPort>
+ <xgr:controlOutPort>Echo_invoke_ctrl_out_0</xgr:controlOutPort>
+ <xgr:x>278</xgr:x>
+ <xgr:y>123</xgr:y>
+ <xgr:wsdl>Echo</xgr:wsdl>
+ <xgr:portType>{http://airavata.apache.org/schemas/gfac/2012/12}Echo</xgr:portType>
+ <xgr:operation>invoke</xgr:operation>
+ </xgr:node>
+ <xgr:node xgr:type="input">
+ <xgr:id>echo_input</xgr:id>
+ <xgr:name>echo_input</xgr:name>
+ <xgr:outputPort>Input_out_2</xgr:outputPort>
+ <xgr:x>151</xgr:x>
+ <xgr:y>103</xgr:y>
+ <xgr:config>
+ <xgr:description></xgr:description>
+ <xgr:dataType>{http://airavata.apache.org/schemas/gfac/2012/12}StringParameterType</xgr:dataType>
+ <xgr:visibility>true</xgr:visibility>
+ </xgr:config>
+ </xgr:node>
+ <xgr:node xgr:type="output">
+ <xgr:id>echo_output</xgr:id>
+ <xgr:name>echo_output</xgr:name>
+ <xgr:inputPort>Output_in_2</xgr:inputPort>
+ <xgr:x>510</xgr:x>
+ <xgr:y>125</xgr:y>
+ <xgr:config>
+ <xgr:description></xgr:description>
+ <xgr:dataType>{http://airavata.apache.org/schemas/gfac/2012/12}StringParameterType</xgr:dataType>
+ </xgr:config>
+ </xgr:node>
+ <xgr:port xgr:type="ws">
+ <xgr:id>Echo_invoke_in_0</xgr:id>
+ <xgr:name>echo_input</xgr:name>
+ <xgr:node>Echo_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="ws">
+ <xgr:id>Echo_invoke_out_0</xgr:id>
+ <xgr:name>echo_output</xgr:name>
+ <xgr:node>Echo_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>Echo_invoke_ctrl_in_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>Echo_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="control">
+ <xgr:id>Echo_invoke_ctrl_out_0</xgr:id>
+ <xgr:name>control</xgr:name>
+ <xgr:node>Echo_invoke</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>Input_out_2</xgr:id>
+ <xgr:name>Parameter</xgr:name>
+ <xgr:node>echo_input</xgr:node>
+ </xgr:port>
+ <xgr:port xgr:type="systemData">
+ <xgr:id>Output_in_2</xgr:id>
+ <xgr:name>Parameter</xgr:name>
+ <xgr:node>echo_output</xgr:node>
+ </xgr:port>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>Input_out_2</xgr:fromPort>
+ <xgr:toPort>Echo_invoke_in_0</xgr:toPort>
+ </xgr:edge>
+ <xgr:edge xgr:type="data">
+ <xgr:fromPort>Echo_invoke_out_0</xgr:fromPort>
+ <xgr:toPort>Output_in_2</xgr:toPort>
+ </xgr:edge>
+ </xgr:graph>
+ <xwf:wsdls>
+ <xwf:wsdl xwf:id="Echo"><wsdl:definitions name="Echo" targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12"
+ xmlns:typens="http://airavata.apache.org/schemas/gfac/2012/12/Echo/xsd" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:globalTypens="http://airavata.apache.org/schemas/gfac/2012/12/xsd"
+ xmlns:wsdlns="http://airavata.apache.org/schemas/gfac/2012/12" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:gfac="http://airavata.apache.org/schemas/gfac/2012/12" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+ <schema elementFormDefault="unqualified" targetNamespace="http://airavata.apache.org/schemas/gfac/2012/12/Echo/xsd" xmlns="http://www.w3.org/2001/XMLSchema">
+ <import namespace="http://airavata.apache.org/schemas/gfac/2012/12" schemaLocation="http://airavata.apache.org/schemas/gfac/2012/12/GFacParameterTypes.xsd" />
+ <element name="invoke_InputParams" type="typens:invoke_InputParamsType" />
+ <complexType name="invoke_InputParamsType">
+ <sequence>
+ <element name="echo_input" type="gfac:StringParameterType">
+ <annotation>
+ <documentation />
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ <element name="invoke_OutputParams" type="typens:invoke_OutputParamsType" />
+ <complexType name="invoke_OutputParamsType">
+ <sequence>
+ <element name="echo_output" type="gfac:StringParameterType">
+ <annotation>
+ <documentation />
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+ </schema>
+ </wsdl:types>
+ <wsdl:message name="invoke_ResponseMessage_504bca7e-4bb2-4432-84bc-f5f21f77ac76">
+ <wsdl:part name="parameters" element="typens:invoke_OutputParams">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="invoke_RequestMessage_ebe74610-34d1-4a31-8e00-84c2b2219843">
+ <wsdl:part name="parameters" element="typens:invoke_InputParams">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="Echo">
+<wsdl:documentation />
+ <wsdl:operation name="invoke">
+<wsdl:documentation />
+ <wsdl:input name="invoke_RequestMessage_ebe74610-34d1-4a31-8e00-84c2b2219843" message="wsdlns:invoke_RequestMessage_ebe74610-34d1-4a31-8e00-84c2b2219843">
+ </wsdl:input>
+ <wsdl:output name="invoke_ResponseMessage_504bca7e-4bb2-4432-84bc-f5f21f77ac76" message="wsdlns:invoke_ResponseMessage_504bca7e-4bb2-4432-84bc-f5f21f77ac76">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+</wsdl:definitions></xwf:wsdl>
+ </xwf:wsdls>
+ <xwf:image>iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFUlEQVR42mN49Ojef2Iww6hC+ioE
+AJr2avQ9sXYrAAAAAElFTkSuQmCC
+</xwf:image>
+</xwf:workflow>
\ No newline at end of file
Added: airavata/trunk/modules/integration-tests/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/resources/log4j.properties?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/resources/log4j.properties (added)
+++ airavata/trunk/modules/integration-tests/src/test/resources/log4j.properties Mon Dec 10 21:39:46 2012
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+
+# Set root category priority to INFO and its only appender to CONSOLE.
+log4j.rootCategory=INFO, CONSOLE,LOGFILE
+log4j.rootLogger=INFO, CONSOLE, LOGFILE
+
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %m%n
+
+# LOGFILE is set to be a File appender using a PatternLayout.
+log4j.appender.LOGFILE=org.apache.log4j.FileAppender
+log4j.appender.LOGFILE.File=./integration-tests.log
+log4j.appender.LOGFILE.Append=true
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
Added: airavata/trunk/modules/integration-tests/src/test/resources/registry.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/resources/registry.properties?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/resources/registry.properties (added)
+++ airavata/trunk/modules/integration-tests/src/test/resources/registry.properties Mon Dec 10 21:39:46 2012
@@ -0,0 +1,54 @@
+#
+#
+# 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.
+#
+#
+
+
+###########################################################################
+#
+# This properties file provides configuration to connect to Registry.
+# Please do not use this for any server configurations.
+#
+###########################################################################
+
+###---------------------------REGISTRY API IMPLEMENTATION---------------------------###
+
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
+
+###---------------------REGISTRY API IMPLEMENTATION - CUSTOM SETTINGS----------------------###
+
+#for mysql [AiravataJPARegistry]
+#registry.jdbc.driver=com.mysql.jdbc.Driver
+#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
+
+#for derby [AiravataJPARegistry]
+registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
+registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
+registry.jdbc.user=airavata
+registry.jdbc.password=airavata
+start.derby.server.mode=true
+
+default.registry.user=admin
+default.registry.password=admin
+default.registry.gateway=default
+
+#for rest [RegistryClient]
+#registry.jdbc.url=http://localhost:9080/airavata-services
+
Added: airavata/trunk/modules/integration-tests/tomcat-distribution.iml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/tomcat-distribution.iml?rev=1419801&view=auto
==============================================================================
--- airavata/trunk/modules/integration-tests/tomcat-distribution.iml (added)
+++ airavata/trunk/modules/integration-tests/tomcat-distribution.iml Mon Dec 10 21:39:46 2012
@@ -0,0 +1,643 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="false" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/target/maven-shared-archive-resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/target/maven-shared-archive-resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target/antrun" />
+ <excludeFolder url="file://$MODULE_DIR$/target/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/target/dependency-maven-plugin-markers" />
+ <excludeFolder url="file://$MODULE_DIR$/target/failsafe-reports" />
+ <excludeFolder url="file://$MODULE_DIR$/target/generated-sources" />
+ <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
+ <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
+ <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
+ <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
+ <excludeFolder url="file://$MODULE_DIR$/target/tests" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="airavata-client-api" />
+ <orderEntry type="module" module-name="airavata-registry-api" />
+ <orderEntry type="module" module-name="airavata-gfac-schema-utils" />
+ <orderEntry type="module" module-name="airavata-common-utils" />
+ <orderEntry type="module" module-name="airavata-message-monitor" />
+ <orderEntry type="module" module-name="airavata-workflow-model-core" />
+ <orderEntry type="module" module-name="airavata-workflow-tracking" />
+ <orderEntry type="module" module-name="airavata-messenger-client" />
+ <orderEntry type="module" module-name="airavata-messenger-commons" />
+ <orderEntry type="module" module-name="airavata-workflow-execution-context" />
+ <orderEntry type="module" module-name="airavata-workflow-model-component" />
+ <orderEntry type="module" module-name="airavata-message-broker" />
+ <orderEntry type="module" module-name="airavata-gfac-core" />
+ <orderEntry type="module" module-name="airavata-message-box" />
+ <orderEntry type="module" module-name="airavata-xbaya-gui" />
+ <orderEntry type="module" module-name="airavata-jpa-registry" />
+ <orderEntry type="module" module-name="airavata-gfac-axis2-interface" />
+ <orderEntry type="module" module-name="airavata-rest-mappings" />
+ <orderEntry type="module" module-name="airavata-rest-client" />
+ <orderEntry type="module" module-name="airavata-registry-service" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xmlbeans/xbean/2.5.0/xbean-2.5.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/wsdl4j/wsdl4j/1.5.2/wsdl4j-1.5.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.5.0/xmlbeans-2.5.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xpp5/xpp5/1.2.6/xpp5-1.2.6.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xsul/xsul/2.10.5_d/xsul-2.10.5_d.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xsul5-ogce/xsul5-2007-02-27/1/xsul5-2007-02-27-1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/axis2/axis2-kernel/1.5.1/axis2-kernel-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/commons/axiom/axiom-api/1.2.8/axiom-api-1.2.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-activation_1.1_spec/1.0.1/geronimo-activation_1.1_spec-1.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/1.2/geronimo-javamail_1.4_spec-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0.1/geronimo-stax-api_1.0_spec-1.0.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/commons/axiom/axiom-impl/1.2.8/axiom-impl-1.2.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/woodstox/wstx-asl/3.2.4/wstx-asl-3.2.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/commons/axiom/axiom-dom/1.2.8/axiom-dom-1.2.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.2/geronimo-ws-metadata_2.0_spec-1.1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1/geronimo-jta_1.1_spec-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.2/commons-codec-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/commons/schema/XmlSchema/1.4.3/XmlSchema-1.4.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/neethi/neethi/2.0.4/neethi-2.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/woden/woden-api/1.0M8/woden-api-1.0M8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xerces/xmlParserAPIs/2.6.0/xmlParserAPIs-2.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/woden/woden-impl-dom/1.0M8/woden-impl-dom-1.0M8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4/mail-1.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xalan/xalan/2.7.0/xalan-2.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/1.4/commons-io-1.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/gpel/gpel_client/1.0.7-BETA/gpel_client-1.0.7-BETA.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.7/junit-4.7.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.2/jcl-over-slf4j-1.7.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.2/slf4j-log4j12-1.7.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/atomixmiser/atomixmiser/0.9.4/atomixmiser-0.9.4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/edu/berkeley/yfilter/1.0/yfilter-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/axis2/axis2-transport-http/1.5.1/axis2-transport-http-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.0/httpcore-4.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/axis2/axis2-transport-local/1.5.1/axis2-transport-local-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/axis2/axis2-codegen/1.5.1/axis2-codegen-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/axis2/axis2-adb/1.5.1/axis2-adb-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/axis2/axis2-adb-codegen/1.5.1/axis2-adb-codegen-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/jcr/jcr/2.0/jcr-2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-json/1.13/jersey-json-1.13.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jettison/jettison/1.1/jettison-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.2.3-1/jaxb-impl-2.2.3-1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/xml/bind/jaxb-api/2.2.2/jaxb-api-2.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-core-asl/1.9.2/jackson-core-asl-1.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-jaxrs/1.9.2/jackson-jaxrs-1.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-xc/1.9.2/jackson-xc-1.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.13/jersey-core-1.13.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-client/1.13/jersey-client-1.13.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ </component>
+</module>
+
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java?rev=1419801&r1=1419800&r2=1419801&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java Mon Dec 10 21:39:46 2012
@@ -208,17 +208,19 @@ public class HostDescriptorResource exte
em = ResourceUtils.getEntityManager();
em.getTransaction().begin();
Host_Descriptor hostDescriptor = new Host_Descriptor();
- Gateway gateway = new Gateway();
- gateway.setGateway_name(gatewayName);
- Users user = new Users();
- user.setUser_name(userName);
+ Gateway existingGateway = em.find(Gateway.class, gatewayName);
+ Users existingUser = em.find(Users.class, userName);
+// Gateway gateway = new Gateway();
+// gateway.setGateway_name(gatewayName);
+// Users user = new Users();
+// user.setUser_name(userName);
hostDescriptor.setHost_descriptor_ID(getHostDescName());
- hostDescriptor.setGateway(gateway);
+ hostDescriptor.setGateway(existingGateway);
byte[] contentBytes = content.getBytes();
hostDescriptor.setHost_descriptor_xml(contentBytes);
- hostDescriptor.setUser(user);
+ hostDescriptor.setUser(existingUser);
if (existingHost_desc != null) {
- existingHost_desc.setUser(user);
+ existingHost_desc.setUser(existingUser);
existingHost_desc.setHost_descriptor_xml(contentBytes);
hostDescriptor = em.merge(existingHost_desc);
} else {
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java?rev=1419801&r1=1419800&r2=1419801&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java Mon Dec 10 21:39:46 2012
@@ -84,7 +84,7 @@ public class UserWorkflowResourceClient
webResource = getUserWFRegistryBaseResource().path(
ResourcePathConstants.UserWFConstants.WORKFLOW_EXIST);
MultivaluedMap queryParams = new MultivaluedMapImpl();
- queryParams.add("workflowname", workflowName);
+ queryParams.add("workflowName", workflowName);
ClientResponse response = webResource.queryParams(queryParams).accept(
MediaType.TEXT_PLAIN).get(ClientResponse.class);
int status = response.getStatus();
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/HttpAuthenticatorFilter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/HttpAuthenticatorFilter.java?rev=1419801&r1=1419800&r2=1419801&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/HttpAuthenticatorFilter.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/HttpAuthenticatorFilter.java Mon Dec 10 21:39:46 2012
@@ -144,9 +144,6 @@ public class HttpAuthenticatorFilter imp
@Override
public void destroy() {
- if (this.authenticatorList != null) {
- this.authenticatorList.clear();
- }
this.authenticatorList = null;
}