[maven-release-plugin] copy for tag airavata-0.11
git-svn-id: https://svn.apache.org/repos/asf/airavata/tags/airavata-0.11@1553542 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/distribution/airavata-client/src/main/resources/INSTALL b/modules/distribution/airavata-client/src/main/resources/INSTALL
index 9d36db0..c815ce0 100644
--- a/modules/distribution/airavata-client/src/main/resources/INSTALL
+++ b/modules/distribution/airavata-client/src/main/resources/INSTALL
@@ -1,4 +1,4 @@
-Installing Apache Airavata Client 0.7
+Installing Apache Airavata Client 0.11
--------------------------------------
Prerequisites
diff --git a/modules/distribution/airavata-server/src/main/resources/INSTALL b/modules/distribution/airavata-server/src/main/resources/INSTALL
index f7d79b0..0324e61 100644
--- a/modules/distribution/airavata-server/src/main/resources/INSTALL
+++ b/modules/distribution/airavata-server/src/main/resources/INSTALL
@@ -1,4 +1,4 @@
-Installing Apache Airavata 0.10
+Installing Apache Airavata 0.11
-------------------------------
Prerequisites
diff --git a/modules/distribution/airavata-server/src/main/resources/NOTICE b/modules/distribution/airavata-server/src/main/resources/NOTICE
index adef397..bef9655 100644
--- a/modules/distribution/airavata-server/src/main/resources/NOTICE
+++ b/modules/distribution/airavata-server/src/main/resources/NOTICE
@@ -1,5 +1,5 @@
Apache Airavata
-Copyright 2012 The Apache Software Foundation
+Copyright 2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -160,4 +160,4 @@
Apache XmlSchema Notice:
Portions Copyright 2006 International Business Machines Corp.
-================================================================================================
\ No newline at end of file
+================================================================================================
diff --git a/modules/distribution/airavata-server/src/main/resources/README b/modules/distribution/airavata-server/src/main/resources/README
index 2c0348c..1539b8c 100644
--- a/modules/distribution/airavata-server/src/main/resources/README
+++ b/modules/distribution/airavata-server/src/main/resources/README
@@ -18,7 +18,7 @@
Release Notes
=============
-0.10 is the ninth release of Airavata (skipped 0.1-INCUBATNG). This release focuses bug fixes and GSISSH library for beta testing. For detailed tasks list, please see RELEASE_NOTES.
+0.11 is the tenth release of Airavata (skipped 0.1-INCUBATNG). This release focuses bug fixes and GSISSH library for beta testing. For detailed tasks list, please see RELEASE_NOTES.
Building from source
====================
diff --git a/modules/distribution/airavata-server/src/main/resources/war/INSTALL b/modules/distribution/airavata-server/src/main/resources/war/INSTALL
index 78813c5..0324e61 100644
--- a/modules/distribution/airavata-server/src/main/resources/war/INSTALL
+++ b/modules/distribution/airavata-server/src/main/resources/war/INSTALL
@@ -1,4 +1,4 @@
-Installing Apache Airavata 0.7
+Installing Apache Airavata 0.11
-------------------------------
Prerequisites
@@ -13,23 +13,35 @@
$ mvn clean install
Note: in order to skip tests use the command
$ mvn clean install -Dmaven.test.skip=true
-* The compressed binary distribution is created at <PROJECT DIR>/modules/distribution/airavata-server/target/apache-airavata-server-<airavata-version>-war.zip
+* The compressed binary distribution is created at <PROJECT DIR>/modules/distribution/airavata-server/target/apache-airavata-server-<airavata-version>-bin.zip
Installing the Airavata Server
------------------------------
-Extract the distribution & copy the web application archives (*.war files) to
-<TOMCAT_HOME>/webapps
+No installation is necessary. Just extract the compressed distribution.
Note: For customizing the default configurations of the Airavata Server please
refer to Airavata web-site (http://airavata.apache.org/) and/or Airavata
mailing lists (http://airavata.apache.org/community/mailing-lists.html)
-Starting Apache Airavata Server Web Application
------------------------------------------------
-* If the tomcat server has already beeing started check to see if the tomcat had automatically deployed the
- web applications (You can find this out by the tomcat manager from the browser or from the tomcat log).
-* If the tomcat has not deployed the web application, stop & restart the tomcat server. Please refer tomcat
- documentation for further details on how to start/stop a tomcat server.
- (http://tomcat.apache.org/tomcat-7.0-doc/architecture/startup.html)
+Starting Apache Airavata Server
+-------------------------------
+* Navigate to <AIRAVATA_HOME>/bin
+* type for following command to start the Airavata Server
+ MAC/Unix systems
+ $ sh airavata-server.sh
+ Windows
+ > airavata-server.bat
+ Note: Pass "-h" as parameters to see more options when starting the server
+
+Starting Apache Derby Server
+-------------------------------
+Users have the option to star the derby server separately
+* Navigate to <AIRAVATA_HOME>/bin
+* type for following command to start the Airavata Server
+ MAC/Unix systems
+ $ sh derby.sh
+ Windows
+ <Not supported in this version>
+ Note: Pass "-h" as parameters to see more options when starting the server
Running Tests
-------------
diff --git a/modules/distribution/airavata-server/src/main/resources/war/LICENSE b/modules/distribution/airavata-server/src/main/resources/war/LICENSE
index 3a4d1a4..b455a1c 100644
--- a/modules/distribution/airavata-server/src/main/resources/war/LICENSE
+++ b/modules/distribution/airavata-server/src/main/resources/war/LICENSE
@@ -217,6 +217,20 @@
jets3t-0.8.0.jar, jettison-1.0-RC2.jar, neethi-2.0.4.jar, PDFBox libraries
(pdfbox, jempbox, fontbox), wstx-asl-3.2.4.jar
+- Bean Validation API (http://beanvalidation.org) javax.validation:validation-api:jar:1.1.0.Final
+- Hibernate Validator Engine (http://validator.hibernate.org/hibernate-validator) org.hibernate:hibernate-validator:jar:4.3.0.Final
+- GSS-API implementation for SSL with proxies (https://github.com/jglobus/JGlobus/gss) org.jglobus:gss:jar:2.0.6
+- SSL support (https://github.com/jglobus/JGlobus/jsse) org.jglobus:jsse:jar:2.0.6
+- myproxy (https://github.com/jglobus/JGlobus/myproxy) org.jglobus:myproxy:jar:2.0.6
+- SSL and proxy certificate support (https://github.com/jglobus/JGlobus/ssl-proxies) org.jglobus:ssl-proxies:jar:2.0.6
+- Bouncy Castle for GSS (https://github.com/jsiwek/BouncyCastleSSLv3) org.ogce:bcgss:jar:146
+- StAX API (http://stax.codehaus.org/) stax:stax-api:jar:1.0.1
+- Commons Codec (http://commons.apache.org/codec/) commons-codec:commons-codec:jar:1.4
+- Commons IO (http://commons.apache.org/io/) commons-io:commons-io:jar:1.4
+- Commons Lang (http://commons.apache.org/lang/) commons-lang:commons-lang:jar:2.6
+- Commons Logging (http://commons.apache.org/logging) commons-logging:commons-logging:jar:1.1.1
+- XmlBeans (http://xmlbeans.apache.org) org.apache.xmlbeans:xmlbeans:jar:2.5.0
+
===============================================================================
The following components use Apache based Licenses
===============================================================================
@@ -1236,6 +1250,9 @@
===============================================================================
Eclipse JDT Core (core-3.1.1.jar)
+-AspectJ runtime (http://www.aspectj.org) org.aspectj:aspectjrt:jar:1.6.12
+ License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html)
+
Eclipse Public License - v 1.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
@@ -2228,6 +2245,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+
================================================================================
gsabes-client-1.6.0.jar
@@ -2269,4 +2287,101 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+================================================================================
+From: 'JCraft,Inc.' (http://www.jcraft.com/)
+ - JSch (http://www.jcraft.com/jsch/) com.jcraft:jsch:jar:0.1.50
+ License: Revised BSD (http://www.jcraft.com/jsch/LICENSE.txt)
+
+================================================================================
+
+Copyright (c) 2002-2012 Atsuhiko Yamanaka, JCraft,Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+
+ 3. The names of the authors may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+================================================================================
+
+From: 'jcabi.com' (http://www.jcabi.com)
+ - jcabi-aspects (http://www.jcabi.com/jcabi-aspects) com.jcabi:jcabi-aspects:jar:0.9
+ License: BSD (http://www.jcabi.com/LICENSE.txt)
+ - jcabi-log (http://www.jcabi.com/jcabi-log) com.jcabi:jcabi-log:jar:0.7
+ License: BSD (http://www.jcabi.com/LICENSE.txt)
+================================================================================
+
+Copyright (c) 2012-2013, JCabi.com
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met: 1) Redistributions of source code must retain the above
+copyright notice, this list of conditions and the following
+disclaimer. 2) Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials provided
+with the distribution. 3) Neither the name of the jcabi.com nor
+the names of its contributors may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+================================================================================
+- Bouncy Castle Provider (http://www.bouncycastle.org/java.html) org.bouncycastle:bcprov-jdk16:jar:1.45
+ License: Bouncy Castle Licence (http://www.bouncycastle.org/licence.html)
+================================================================================
+
+Please note this should be read in the same way as the MIT license.
+
+LICENSE
+Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/modules/distribution/airavata-server/src/main/resources/war/README b/modules/distribution/airavata-server/src/main/resources/war/README
index fdea4c8..3c86da2 100644
--- a/modules/distribution/airavata-server/src/main/resources/war/README
+++ b/modules/distribution/airavata-server/src/main/resources/war/README
@@ -1,4 +1,4 @@
-Apache Airavata Server Web Applications - README.txt
+Apache Airavata Server - README.txt
Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
--------------------------------------------------------------------------------
@@ -13,29 +13,52 @@
to suit their needs. Airavata builds on general concepts of service oriented computing,
distributed messaging, and workflow composition and orchestration.
-This distribution allows you to run Airavata Server in a tomcat hosted environment. It
-includes all the airavata services shipped with a default derby database as the backend
-registry.
+This distribution allows you to run a standalone Airavata Server which includes all the
+airavata services shipped with a default derby database as the backend registry.
Release Notes
=============
-0.7 is the sixth release of Airavata (skipped 0.1-INCUBATNG). This release focuses GFac rearchitecturing and more GFac level changes. For detailed tasks list, please see RELEASE_NOTES.
+0.11 is the ninth release of Airavata (skipped 0.1-INCUBATNG). This release focuses bug fixes and GSISSH library for beta testing. For detailed tasks list, please see RELEASE_NOTES.
Building from source
====================
-For brief installation instructions, see INSTALL for detailed installation and further instructions refer http://airavata.apache.org/ - Documentation section in left hand panel. Step by step with proper documentation are provided.
+For brief installation instructions, see INSTALL
+For detailed installation and further instructions refer http://airavata.apache.org/ - Documentation section in left hand panel. Step by step with proper documentation are provided.
Known Issues in This Release
============================
-This is the base release and is focused on a good foundation and less on features. This version is not recommended for production usage.
+This is the base release and is focused on a good foundation and less on features. This
+version is not recommended for production usage.
-Airavata Web Application Distribution Directory Structure
-=========================================================
+Airavata Binary Distribution Directory Structure
+================================================
- AIRAVATA_WEBAPP_DISTRIBUTION
- ├── airavata-registry.war
- ├── airavata-server.war
+ AIRAVATA_HOME
+ ├── bin
+ │ ├── database_scripts <dir>
+ │ ├── airavata-server.bat
+ │ ├── airavata-server.properties
+ │ ├── airavata-server.sh
+ │ ├── authenticators.xml
+ │ ├── axis2.xml
+ │ ├── derby.sh
+ │ ├── host.xml
+ │ ├── log4j.properties
+ │ ├── logo.txt
+ │ ├── setenv.bat
+ │ ├── setenv.sh
+ │ └── startNetworkServer
+ ├── lib <dir>
+ ├── repository
+ │ ├── modules
+ │ └── services
+ ├── samples
+ │ ├── workflows <dir>
+ │ ├── echo_out.sh
+ │ └── echo.sh
├── INSTALL
+ ├── LICENSE
+ ├── NOTICE
└── README
@@ -49,12 +72,21 @@
Description of Directory Structure
==================================
+ - bin
+ This contains all the configuration files & the executable scripts to run the Airavata Server (Axis2 server
+ with Airavata services which include messageBroker and messageBox with GFac Axis2 services), & a standalone Apache Derby server.
- - airavata-registry.war
- This deploys the airavata rest registry service capable of performing Airavata registry operations
+ - bin - database_scripts
+ Contains the database scripts which are used to create tables for messagebox and messagebroker services
- - airavata-server.war
- This deploys the airavata server web services capable launching & monitoring experiments, applications etc.
+ - samples
+ This contains sample workflow to try out & sample application scripts.
+
+ - lib
+ This contains all the libraries required to run the airavata server and/or derby server.
+
+ - repository - services
+ Contains deployed services in Axis2 runtime.
- README
This document.
@@ -62,6 +94,7 @@
- INSTALL
This document will contain information on installing Apache-Airavata.
+
Other Available Distributions
=============================
@@ -69,19 +102,20 @@
--------------------
* Airavata Server
The Airavata Server binary distribution allows you to run a standalone Airavata Server which includes all the airavata services
- shipped with a default derby database as the backend registry.
+ shipped with a default derby database as the backend registry. For stable purposes, a mysql configuration is recommended.
+
+* Airavata Server Web Application
+ This is similar package as the Airavata Server but is distributed as the server Web Application archive.
+ This war is compatible with Apache Tomcat application server. The war bundles all airavata services
+ enabled by defualt to startup a derby database as the backend registry. For stable purposes, a mysql configuration is recommended.
Client Distributions
--------------------
* Airavata XBaya
- The Airavata XBaya distribution is a client gui application capable of composing workflows, application descriptors & communicating
- with the airavata server to persist user data, run & monitor experiments and analyze the results.
+ The Airavata XBaya distribution is a client GUI application with features to register applications as web services, construct workflows,
+ execute and monitor workflows and browse the generated results from the airavata registry.
* Airavata XBaya JNLP
- The Airavata XBaya JNLP distribution is a client gui application designed to be hosted on a web server as a web start application
- that can compose workflows, application descriptors & communicate with the airavata server to persist user data, run & monitor experiments
- and analyze the results.
-
-* Airavata Client
- The Airavata Client distribution is a set of libraries and configurations files that allow a 3rd party application to programatically
- access Airavata functionality through Airavata API.
+ The Airavata XBaya JNLP distribution is the simular GUI distribution but prepackeged to be ready to be deployed to
+ a web server as a web start application. The GUI provides features to register applications as web services, construct workflows,
+ execute and monitor workflows and browse the generated results from the airavata registry.
diff --git a/modules/distribution/xbaya-gui/src/main/resources/INSTALL b/modules/distribution/xbaya-gui/src/main/resources/INSTALL
index e68c2f4..1d6d275 100644
--- a/modules/distribution/xbaya-gui/src/main/resources/INSTALL
+++ b/modules/distribution/xbaya-gui/src/main/resources/INSTALL
@@ -1,4 +1,4 @@
-Installing Apache Airavata XBaya 0.7
+Installing Apache Airavata XBaya 0.11
-------------------------------------
Prerequisites
diff --git a/modules/distribution/xbaya-gui/src/main/resources/README b/modules/distribution/xbaya-gui/src/main/resources/README
index dabca1b..6ca8faf 100644
--- a/modules/distribution/xbaya-gui/src/main/resources/README
+++ b/modules/distribution/xbaya-gui/src/main/resources/README
@@ -19,7 +19,7 @@
Release Notes
=============
-0.7 is the sixth release of Airavata (skipped 0.1-INCUBATNG). This release focuses GFac rearchitecturing and more GFac level changes. For detailed tasks list, please see RELEASE_NOTES.
+0.11 is the tenth release of Airavata (skipped 0.1-INCUBATNG). This release focuses GFac rearchitecturing and more GFac level changes. For detailed tasks list, please see RELEASE_NOTES.
Building from source
====================
diff --git a/modules/distribution/xbaya-gui/src/main/resources/jnlp/INSTALL b/modules/distribution/xbaya-gui/src/main/resources/jnlp/INSTALL
index 2ddb836..24ae962 100644
--- a/modules/distribution/xbaya-gui/src/main/resources/jnlp/INSTALL
+++ b/modules/distribution/xbaya-gui/src/main/resources/jnlp/INSTALL
@@ -1,4 +1,4 @@
-Installing Apache Airavata XBaya 0.7
+Installing Apache Airavata XBaya 0.11
-------------------------------------
Prerequisites
diff --git a/modules/distribution/xbaya-gui/src/main/resources/jnlp/README b/modules/distribution/xbaya-gui/src/main/resources/jnlp/README
index 756f465..092c20e 100644
--- a/modules/distribution/xbaya-gui/src/main/resources/jnlp/README
+++ b/modules/distribution/xbaya-gui/src/main/resources/jnlp/README
@@ -20,7 +20,7 @@
Release Notes
=============
-0.7 is the sixth release of Airavata (skipped 0.1-INCUBATNG). This release focuses GFac rearchitecturing and more GFac level changes. For detailed tasks list, please see RELEASE_NOTES.
+0.11 is the tenth release of Airavata (skipped 0.1-INCUBATNG). This release focuses GFac rearchitecturing and more GFac level changes. For detailed tasks list, please see RELEASE_NOTES.
Building from source
====================
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GramProvider.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GramProvider.java
index fdd84dc..fbee8d3 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GramProvider.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GramProvider.java
@@ -179,7 +179,7 @@
* batch.
* The third boolean is to specify to use the full proxy and not delegate a limited proxy.
*/
- job.request(gateKeeper, false, false);
+ job.request(true, gateKeeper, false, false);
// Single boolean to track all authentication failures, therefore we need to re-initialize
// this here
@@ -245,7 +245,7 @@
*/
try {
- job.request(gateKeeper, false, false);
+ job.request(true, gateKeeper, false, false);
renewCredentialsAttempt = false;
} catch (GramException e) {
diff --git a/modules/rest/webapp/pom.xml b/modules/rest/webapp/pom.xml
index 09b3fc1..4e135a8 100644
--- a/modules/rest/webapp/pom.xml
+++ b/modules/rest/webapp/pom.xml
@@ -188,14 +188,6 @@
<version>${oa4mp.version}</version>
<exclusions>
<exclusion>
- <groupId>net.oauth.core</groupId>
- <artifactId>oauth-httpclient4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.oauth.core</groupId>
- <artifactId>oauth-consumer</artifactId>
- </exclusion>
- <exclusion>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</exclusion>
diff --git a/samples/sample-gateway/pom.xml b/samples/sample-gateway/pom.xml
index 7999042..714e3f1 100644
--- a/samples/sample-gateway/pom.xml
+++ b/samples/sample-gateway/pom.xml
@@ -33,264 +33,10 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ogce</groupId>
- <artifactId>xpp3</artifactId>
- <version>${xpp3.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ogce</groupId>
- <artifactId>xpp5</artifactId>
- <version>${xpp5.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ogce</groupId>
- <artifactId>xsul</artifactId>
- <version>${xsul.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ogce</groupId>
- <artifactId>gpel-client</artifactId>
- <version>${gpel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ogce</groupId>
- <artifactId>atomixmiser</artifactId>
- <version>${atomixmiser.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.python</groupId>
- <artifactId>jython</artifactId>
- <version>${jython.version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>${xmlbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>2.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-http</artifactId>
- <version>${axis2.version}</version>
- </dependency>
-
- <!-- AMAZON STUFFS -->
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.3.20</version>
- </dependency>
- <dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <version>0.8.0</version>
- </dependency>
-
- <!-- AIRAVATA modules -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-xbaya-gui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-model-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-model-component</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-message-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-message-broker</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-common-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-tracking</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-jpa-registry</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-rest-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-rest-mappings</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>json</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- JCR Support -->
- <!-- TODO need clean up -->
- <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-gfac-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>${jcr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-execution-context</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!--dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-jpa-registry</artifactId> <version>${project.version}</version>
- </dependency -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.9.2</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.2</version>
- </dependency>
</dependencies>
diff --git a/samples/sample-gateway/src/main/webapp/gateway/acs.jsp b/samples/sample-gateway/src/main/webapp/gateway/acs.jsp
index 19c805f..94bc6d9 100644
--- a/samples/sample-gateway/src/main/webapp/gateway/acs.jsp
+++ b/samples/sample-gateway/src/main/webapp/gateway/acs.jsp
@@ -44,7 +44,7 @@
<table border="0">
<tr>
<td>Gateway Name</td>
- <td><input type="text" name="gatewayName"></td>
+ <td><input type="text" name="gatewayName" value="default" readonly="readonly"></td>
</tr>
<tr>
<td>Portal Username</td>
diff --git a/samples/sample-gateway/src/main/webapp/images/echowf.png b/samples/sample-gateway/src/main/webapp/images/echowf.png
new file mode 100644
index 0000000..a8ad000
--- /dev/null
+++ b/samples/sample-gateway/src/main/webapp/images/echowf.png
Binary files differ
diff --git a/samples/sample-gateway/src/test/java/org/apache/airavata/sample/gateway/executor/WorkflowExecutorTest.java b/samples/sample-gateway/src/test/java/org/apache/airavata/sample/gateway/executor/WorkflowExecutorTest.java
index 915aa57..5d643e4 100644
--- a/samples/sample-gateway/src/test/java/org/apache/airavata/sample/gateway/executor/WorkflowExecutorTest.java
+++ b/samples/sample-gateway/src/test/java/org/apache/airavata/sample/gateway/executor/WorkflowExecutorTest.java
@@ -50,6 +50,18 @@
}
//@Test
+ public void testRunWorkflowTrestlesOGCEWithToken() throws Exception {
+
+ WorkflowExecutor workflowExecutor = getSampleGatewayExecutor();
+ ExecutionParameters executionParameters = getTrestlesOGCEParameters();
+
+ Workflow workflow = workflowExecutor.setupExperiment(executionParameters);
+ workflowExecutor.runWorkflow(workflow, Arrays.asList("echo_output=Hello World"),
+ "15673deb-cad5-460d-94b7-c4736d8159e5", "kermit");
+
+ }
+
+ //@Test
public void testRunWorkflowStampedeOGCE() throws Exception {
WorkflowExecutor workflowExecutor = getSampleGatewayExecutor();
@@ -81,7 +93,7 @@
Workflow workflow = workflowExecutor.setupExperiment(executionParameters);
workflowExecutor.runWorkflow(workflow, Arrays.asList("echo_output=Hello World"),
- "9964c023-7d30-4247-a6eb-b0c9cd7be138", "bunny");
+ "86cb2ddb-b96c-464c-a542-a8a7ab433add", "bunny");
}
