You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/11/15 01:31:21 UTC
[5/6] airavata git commit: Added xbaya distribution. AIRAVATA-1471
Added xbaya distribution. AIRAVATA-1471
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c4f3c662
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c4f3c662
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c4f3c662
Branch: refs/heads/master
Commit: c4f3c66208759fd7884c66c86ea39517c5e8398e
Parents: c8bf7f1
Author: raminder <ra...@indiana.edu>
Authored: Fri Nov 14 16:17:32 2014 -0500
Committer: raminder <ra...@indiana.edu>
Committed: Fri Nov 14 16:17:32 2014 -0500
----------------------------------------------------------------------
.../src/main/assembly/bin-assembly.xml | 17 +-
modules/distribution/gfac-server/pom.xml | 2 +-
.../src/main/assembly/bin-assembly.xml | 131 +-
.../src/main/assembly/bin-assembly.xml | 56 +-
modules/distribution/xbaya-gui/pom.xml | 471 ++++
.../src/main/assembly/bin-assembly.xml | 101 +
.../airavata/distribution/xbaya/jnlp/Main.java | 156 ++
.../xbaya-gui/src/main/resources/INSTALL | 44 +
.../xbaya-gui/src/main/resources/LICENSE | 2273 ++++++++++++++++++
.../xbaya-gui/src/main/resources/NOTICE | 163 ++
.../xbaya-gui/src/main/resources/README | 101 +
.../src/main/resources/airavata-logo.gif | Bin 0 -> 13895 bytes
.../xbaya-gui/src/main/resources/bin/setenv.bat | 42 +
.../xbaya-gui/src/main/resources/bin/setenv.sh | 77 +
.../src/main/resources/bin/xbaya-gui.bat | 23 +
.../src/main/resources/bin/xbaya-gui.sh | 22 +
.../src/main/resources/conf/log4j.properties | 40 +
.../xbaya-gui/src/main/resources/jnlp/INSTALL | 48 +
.../xbaya-gui/src/main/resources/jnlp/LICENSE | 2272 +++++++++++++++++
.../xbaya-gui/src/main/resources/jnlp/NOTICE | 163 ++
.../xbaya-gui/src/main/resources/jnlp/README | 91 +
.../src/main/resources/jnlp/xbaya.jnlp | 42 +
.../xbaya-gui/src/main/resources/xbaya.jks | Bin 0 -> 2234 bytes
23 files changed, 6138 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c4f3c662/modules/distribution/api-server/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/api-server/src/main/assembly/bin-assembly.xml b/modules/distribution/api-server/src/main/assembly/bin-assembly.xml
index e306ad1..6f5c233 100644
--- a/modules/distribution/api-server/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/api-server/src/main/assembly/bin-assembly.xml
@@ -115,21 +115,8 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.airavata:airavata-standalone-server:jar
- </include>
- <include>org.apache.airavata:airavata-common-utils:jar</include>
- <include>org.apache.airavata:airavata-registry-cpi:jar</include>
- <include>org.apache.airavata:airavata-jpa-registry:jar</include>
- <include>org.apache.airavata:app-catalog-cpi:jar</include>
- <include>org.apache.airavata:app-catalog-data:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.airavata:airavata-credential-store:jar</include>
- <include>org.apache.airavata:airavata-message-monitor:jar</include>
- <include>org.apache.airavata:airavata-messenger-client:jar</include>
- <include>org.apache.openjpa:openjpa-all:jar</include>
- <include>org.apache.zookeeper:zookeeper</include>
-
- </includes>
+ <include>*:*:jar</include>
+ </includes>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c4f3c662/modules/distribution/gfac-server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/gfac-server/pom.xml b/modules/distribution/gfac-server/pom.xml
index a7114e7..38d8acd 100644
--- a/modules/distribution/gfac-server/pom.xml
+++ b/modules/distribution/gfac-server/pom.xml
@@ -24,7 +24,7 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c4f3c662/modules/distribution/gfac-server/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/gfac-server/src/main/assembly/bin-assembly.xml b/modules/distribution/gfac-server/src/main/assembly/bin-assembly.xml
index c8b850d..3fe54cb 100644
--- a/modules/distribution/gfac-server/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/gfac-server/src/main/assembly/bin-assembly.xml
@@ -170,134 +170,9 @@
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:slf4j-jcl:jar</include>
- <include>org.slf4j:slf4j-log4j12:jar</include>
- <include>log4j:log4j:jar</include>
- <include>javax.jcr:jcr:jar</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-configuration:commons-configuration</include>
- <include>commons-lang:commons-lang</include>
- <include>commons-io:commons-io</include>
- <include>org.jglobus:gss</include>
- <include>org.jglobus:gram</include>
- <include>org.jglobus:myproxy</include>
- <include>org.jglobus:gridftp</include>
- <include>org.jglobus:ssl-proxies</include>
- <include>org.jglobus:jsse</include>
- <include>org.jglobus:io</include>
- <include>org.jglobus:axis</include>
- <include>org.apache.xmlbeans:xmlbeans</include>
- <include>com.amazonaws:aws-java-sdk</include>
- <include>net.java.dev.jets3t:jets3t</include>
- <include>org.apache.airavata:airavata-standalone-server:jar
- </include>
- <include>org.apache.airavata:airavata-common-utils:jar</include>
- <include>org.apache.airavata:airavata-registry-cpi:jar</include>
- <include>org.apache.airavata:airavata-jpa-registry:jar</include>
- <include>org.apache.airavata:app-catalog-cpi:jar</include>
- <include>org.apache.airavata:app-catalog-data:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.airavata:airavata-credential-store:jar</include>
- <include>org.apache.airavata:airavata-gfac-core:jar</include>
- <include>org.apache.airavata:airavata-gfac-service:jar</include>
- <include>org.apache.airavata:airavata-gfac-ssh:jar</include>
- <include>org.apache.airavata:airavata-gfac-local:jar</include>
- <include>org.apache.airavata:airavata-gfac-gsissh:jar</include>
- <include>org.apache.airavata:airavata-gfac-hpc-monitor:jar</include>
- <include>org.apache.airavata:airavata-gfac-hadoop:jar</include>
- <include>org.apache.airavata:airavata-gfac-bes:jar</include>
- <include>org.apache.airavata:airavata-gfac-gram:jar</include>
- <include>org.apache.airavata:airavata-message-monitor:jar</include>
- <include>org.apache.airavata:airavata-messenger-commons:jar
- </include>
- <include>org.apache.airavata:airavata-messenger-client:jar</include>
- <include>org.apache.airavata:airavata-workflow-tracking:jar
- </include>
- <include>org.apache.airavata:airavata-workflow-engine:jar</include>
- <include>org.apache.airavata:airavata-messaging-core:jar</include>
- <include>org.apache.airavata:gsissh:jar</include>
- <include>org.apache.airavata:airavata-model-utils:jar</include>
- <include>org.apache.airavata:airavata-api-server:jar</include>
- <include>org.apache.airavata:airavata-api-stubs:jar</include>
- <include>org.apache.openjpa:openjpa-all:jar</include>
- <include>org.bouncycastle:bcprov-jdk15on</include>
- <include>javax.servlet:javax.servlet-api</include>
- <include>xerces:xercesImpl:jar:2.9.1</include>
- <include>com.ibm.icu:icu4j</include>
- <include>com.google.guava:guava</include>
- <include>org.apache.hadoop:hadoop-core</include>
- <include>org.apache.hadoop:hadoop-client</include>
- <include>org.apache.whirr:whirr-hadoop</include>
- <include>org.hamcrest:hamcrest-all</include>
- <include>org.mockito:mockito-all</include>
- <include>com.jcraft:jsch</include>
- <include>net.sf.jopt-simple:jopt-simple</include>
- <include>net.schmizz:sshj</include>
- <include>j2ssh:j2ssh-core</include>
- <include>j2ssh:j2ssh-common</include>
- <include>org.apache.httpcomponents:httpcore:jar:4.2.4</include>
- <include>org.apache.httpcomponents:httpclient:jar:4.2.4</include>
- <include>de.odysseus.staxon:staxon:jar:1.2</include>
- <include>de.odysseus.staxon:staxon-jackson:jar:1.2</include>
- <include>org.ebaysf.web:cors-filter:jar:1.0.0</include>
- <include>org.ogce:bcgss</include>
- <include>org.apache.xmlbeans:xmlbeans</include>
- <include>org.apache.thrift:libthrift:jar:0.9.1</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-codec:commons-codec</include>
- <include>com.rabbitmq:amqp-client</include>
- <include>com.fasterxml.jackson.core:jackson-databind</include>
- <include>com.fasterxml.jackson.core:jackson-core</include>
- <include>com.fasterxml.jackson.core:jackson-annotations</include>
- <include>org.apache.zookeeper:zookeeper</include>
-
- <!-- UNICORE Dependencies Start -->
- <include>eu.unicore:unicore-client-wrapper</include>
- <include>org.apache.xmlbeans:xmlbeans-xpath</include>
- <include>log4j:apache-log4j-extras</include>
- <include>eu.eu-emi.security:canl</include>
- <include>org.bouncycastle:bcpkix-jdk15on</include>
- <include>pl.edu.icm.saml:samly2</include>
- <include>org.apache.ws.security:wss4j</include>
- <include>org.json:json</include>
- <include>org.apache.cxf:cxf-rt-databinding-xmlbeans</include>
- <include>org.apache.cxf:cxf-api</include>
- <include>org.codehaus.woodstox:woodstox-core-asl</include>
- <include>org.codehaus.woodstox:stax2-api</include>
- <include>org.apache.ws.xmlschema:xmlschema-core</include>
- <include>org.apache.cxf:cxf-rt-core</include>
- <include>com.sun.xml.bind:jaxb-impl</include>
- <include>org.apache.cxf:cxf-rt-frontend-jaxws</include>
- <include>xml-resolver:xml-resolver</include>
- <include>asm:asm</include>
- <include>org.apache.cxf:cxf-rt-bindings-soap</include>
- <include>org.apache.cxf:cxf-rt-databinding-jaxb</include>
- <include>org.apache.cxf:cxf-rt-bindings-xml</include>
- <include>org.apache.cxf:cxf-rt-frontend-simple</include>
- <include>org.apache.cxf:cxf-rt-ws-addr</include>
- <include>org.apache.cxf:cxf-rt-ws-policy</include>
- <include>org.apache.cxf:cxf-rt-transports-http</include>
- <include>org.apache.cxf:cxf-rt-features-clustering</include>
- <include>org.apache.neethi:neethi</include>
- <include>org.apache.cxf:cxf-rt-frontend-jaxws</include>
- <include>xml-resolver:xml-resolver</include>
- <include>org.eclipse.jetty:jetty-servlet</include>
- <include>org.eclipse.jetty:jetty-security</include>
- <include>org.eclipse.jetty:jetty-server</include>
- <include>org.eclipse.jetty.orbit:javax.servlet</include>
- <include>org.eclipse.jetty:jetty-servlets</include>
- <include>org.eclipse.jetty:jetty-continuation</include>
- <include>org.eclipse.jetty:jetty-client</include>
- <include>org.eclipse.jetty:jetty-http</include>
- <include>org.eclipse.jetty:jetty-io</include>
- <include>org.eclipse.jetty:jetty-util</include>
- <include>wsdl4j:wsdl4j</include>
- <include>org.apache.santuario:xmlsec</include>
- <include>commons-httpclient:commons-httpclient</include>
- <include>commons-codec:commons-codec</include>
- </includes>
+ <includes>
+ <include>*:*:jar</include>
+ </includes>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c4f3c662/modules/distribution/orchestrator-server/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/orchestrator-server/src/main/assembly/bin-assembly.xml b/modules/distribution/orchestrator-server/src/main/assembly/bin-assembly.xml
index 63af038..3fe54cb 100644
--- a/modules/distribution/orchestrator-server/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/orchestrator-server/src/main/assembly/bin-assembly.xml
@@ -170,59 +170,9 @@
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:slf4j-jcl:jar</include>
- <include>org.slf4j:slf4j-log4j12:jar</include>
- <include>log4j:log4j:jar</include>
- <include>javax.jcr:jcr:jar</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-configuration:commons-configuration</include>
- <include>commons-lang:commons-lang</include>
- <include>commons-io:commons-io</include>
- <include>org.apache.xmlbeans:xmlbeans</include>
- <include>org.apache.airavata:airavata-standalone-server:jar
- </include>
- <include>org.apache.airavata:airavata-common-utils:jar</include>
- <include>org.apache.airavata:airavata-orchestrator-service:jar
- </include>
- <include>org.apache.airavata:airavata-orchestrator-core:jar
- </include>
- <!--<include>org.apache.airavata:airavata-gfac-schema-utils:jar-->
- <!--</include>-->
- <include>org.apache.airavata:airavata-workflow-execution-context:jar
- </include>
- <include>org.apache.airavata:airavata-registry-cpi:jar</include>
- <include>org.apache.airavata:airavata-jpa-registry:jar</include>
- <include>org.apache.airavata:app-catalog-cpi:jar</include>
- <include>org.apache.airavata:app-catalog-data:jar</include>
- <include>org.apache.airavata:airavata-data-models:jar</include>
- <include>org.apache.airavata:airavata-credential-store:jar</include>
- <include>org.apache.airavata:airavata-gfac-core:jar</include>
- <include>org.apache.airavata:airavata-gfac-stubs:jar</include>
- <include>org.apache.airavata:airavata-message-monitor:jar</include>
- <include>org.apache.airavata:airavata-workflow-model-core:jar
- </include>
- <include>org.apache.airavata:airavata-messenger-commons:jar
- </include>
- <include>org.apache.airavata:airavata-messenger-client:jar</include>
- <include>org.apache.airavata:airavata-workflow-engine:jar</include>
- <include>org.apache.airavata:airavata-messaging-core:jar</include>
- <include>org.apache.airavata:airavata-model-utils:jar</include>
- <include>org.apache.airavata:airavata-api-stubs:jar</include>
- <include>org.apache.openjpa:openjpa-all:jar</include>
- <include>org.bouncycastle:bcprov-jdk15on</include>
- <include>javax.servlet:javax.servlet-api</include>
- <include>xerces:xercesImpl:jar:2.9.1</include>
- <include>com.ibm.icu:icu4j</include>
- <include>com.google.guava:guava</include>
- <include>org.apache.xmlbeans:xmlbeans</include>
- <include>org.apache.thrift:libthrift:jar:0.9.1</include>
- <include>commons-cli:commons-cli</include>
- <include>commons-codec:commons-codec</include>
- <include>com.rabbitmq:amqp-client</include>
- <include>org.apache.zookeeper:zookeeper</include>
- </includes>
+ <includes>
+ <include>*:*:jar</include>
+ </includes>
</dependencySet>
</dependencySets>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c4f3c662/modules/distribution/xbaya-gui/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/pom.xml b/modules/distribution/xbaya-gui/pom.xml
new file mode 100644
index 0000000..cb4de69
--- /dev/null
+++ b/modules/distribution/xbaya-gui/pom.xml
@@ -0,0 +1,471 @@
+<?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>distribution</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>apache-airavata-xbaya-gui</artifactId>
+ <name>Airavata xbaya-gui distribution</name>
+ <packaging>pom</packaging>
+ <url>http://airavata.apache.org/</url>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/conf</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${archieve.name}-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>bin-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${airavata.xbaya-bin.zip}</file>
+ <type>zip</type>
+ <classifier>bin</classifier>
+ </artifact>
+ <artifact>
+ <file>${airavata.xbaya-bin.tar.gz}</file>
+ <type>tar.gz</type>
+ <classifier>bin</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile> <!-- JNLP -->
+ <id>jnlp</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>0-copy-xbaya</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.dependency.classpath" />
+ <unzip src="target/apache-airavata-xbaya-gui-${project.version}-bin.zip" dest="${project.build.directory}/temp" />
+ <mkdir dir="${jnlp.direcotry}" />
+ <mkdir dir="${jnlp.direcotry}/lib" />
+ <copy todir="${jnlp.direcotry}/lib">
+ <fileset dir="${xbaya.directory}/lib" />
+ </copy>
+ <copy todir="${jnlp.direcotry}">
+ <fileset dir="${project.basedir}/src/main/resources/jnlp" />
+ </copy>
+ <copy file="${project.basedir}/src/main/resources/airavata-logo.gif" todir="${jnlp.direcotry}" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jarsigner-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>1-sign</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archiveDirectory>${jnlp.direcotry}/lib</archiveDirectory>
+ <keystore>${project.basedir}/src/main/resources/xbaya.jks</keystore>
+ <alias>xbaya</alias>
+ <storepass>xbaya-secret</storepass>
+ <keypass>xbaya-secret</keypass>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <id>2-execute-jnlp-modifier</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>org.apache.airavata.distribution.xbaya.jnlp.Main</mainClass>
+ <arguments>
+ <argument>${jnlp.direcotry}/lib</argument>
+ <argument>${jnlp.direcotry}/xbaya.jnlp</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>zip-jnlp</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>3-zip-xbaya-jnlp</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <zip destfile="${airavata.xbaya-jnlp.zip}" basedir="${jnlp.direcotry}" />
+ <tar destfile="${project.build.directory}/xbaya-jnlp-${project.version}.tar" basedir="${jnlp.direcotry}" />
+ <gzip destfile="${airavata.xbaya-jnlp.tar.gz}" src="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
+ <delete file="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile> <!-- END JNLP -->
+ </profiles>
+
+ <dependencies>
+ <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>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython</artifactId>
+ <version>${jython.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </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-workflow-engine</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-api-stubs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-orchestrator-stubs</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-gfac-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-gfac-ec2</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>org.globusonline</groupId>-->
+ <!--<artifactId>transfer-api-client-java</artifactId>-->
+ <!--<version>0.10.8</version>-->
+ <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-client-configuration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <archieve.name>apache-airavata-xbaya-gui</archieve.name>
+ <airavata.xbaya-dist.name>${archieve.name}-${project.version}</airavata.xbaya-dist.name>
+ <airavata.xbaya-bin.zip>${project.build.directory}/${airavata.xbaya-dist.name}-bin.zip</airavata.xbaya-bin.zip>
+ <airavata.xbaya-bin.tar.gz>${project.build.directory}/${airavata.xbaya-dist.name}-bin.tar.gz</airavata.xbaya-bin.tar.gz>
+ <airavata.xbaya-jnlp.name>xbaya-jnlp-${project.version}</airavata.xbaya-jnlp.name>
+ <airavata.xbaya-jnlp.zip>${project.build.directory}/${airavata.xbaya-jnlp.name}.zip</airavata.xbaya-jnlp.zip>
+ <airavata.xbaya-jnlp.tar.gz>${project.build.directory}/${airavata.xbaya-jnlp.name}.tar.gz</airavata.xbaya-jnlp.tar.gz>
+ <xbaya.directory>${project.build.directory}/temp/apache-airavata-xbaya-gui-${project.version}</xbaya.directory>
+ <jnlp.direcotry>${project.build.directory}/jnlp</jnlp.direcotry>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c4f3c662/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml b/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
new file mode 100644
index 0000000..0eaa46d
--- /dev/null
+++ b/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
@@ -0,0 +1,101 @@
+<!--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. -->
+
+<!DOCTYPE assembly [
+ <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
+ <!ELEMENT id (#PCDATA)>
+ <!ELEMENT includeBaseDirectory (#PCDATA)>
+ <!ELEMENT baseDirectory (#PCDATA)>
+ <!ELEMENT formats (format)*>
+ <!ELEMENT format (#PCDATA)>
+ <!ELEMENT fileSets (fileSet)*>
+ <!ELEMENT fileSet (directory|outputDirectory|includes)*>
+ <!ELEMENT directory (#PCDATA)>
+ <!ELEMENT outputDirectory (#PCDATA)>
+ <!ELEMENT includes (include)*>
+ <!ELEMENT include (#PCDATA)>
+ <!ELEMENT dependencySets (dependencySet)*>
+ <!ELEMENT dependencySet (outputDirectory|includes)*>
+ ]>
+<assembly>
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${archieve.name}-${version}</baseDirectory>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- ********************** copy release notes files ********************** -->
+ <fileSet>
+ <directory>../../../</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+ <!-- ********************** copy licenses, readme etc. ********************** -->
+ <fileSet>
+ <directory>src/main/resources/</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
+ <include>INSTALL</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../../xbaya-gui/src/test/resources/</directory>
+ <outputDirectory>samples/workflows</outputDirectory>
+ <includes>
+ <include>*.xwf</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../../samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/conf</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.apache.derby:derby:jar</include>
+ <include>org.apache.derby:derbytools:jar</include>
+ <include>org.apache.derby:derbynet:jar</include>
+ <include>org.apache.derby:derbyclient:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*:*:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/airavata/blob/c4f3c662/modules/distribution/xbaya-gui/src/main/java/org/apache/airavata/distribution/xbaya/jnlp/Main.java
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/src/main/java/org/apache/airavata/distribution/xbaya/jnlp/Main.java b/modules/distribution/xbaya-gui/src/main/java/org/apache/airavata/distribution/xbaya/jnlp/Main.java
new file mode 100644
index 0000000..b9998b7
--- /dev/null
+++ b/modules/distribution/xbaya-gui/src/main/java/org/apache/airavata/distribution/xbaya/jnlp/Main.java
@@ -0,0 +1,156 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+package org.apache.airavata.distribution.xbaya.jnlp;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class will go through lib directory and creates the jnlp configuration file.
+ */
+public class Main {
+
+ private static final String CONFIGURATION_ELEMENT = "DEPENDENT_JARS";
+
+ public static void main(String[] args) {
+
+ if (args.length != 2) {
+ System.err
+ .println("[ERROR] JNLP creator must be given with lib directory of Xbaya and JNLP template location.");
+ System.exit(-1);
+ }
+
+ String libDirectory = args[0];
+ String jnlpTemplateFile = args[1];
+
+ System.out.println("[INFO] The lib directory is " + libDirectory);
+ System.out.println("[INFO] The jnlp file is " + jnlpTemplateFile);
+
+ File libDirectoryFile = new File(libDirectory);
+
+ if (!libDirectoryFile.exists()) {
+ System.err.println("[ERROR] Invalid lib directory given - " + libDirectory + ". Cannot add dependent jars");
+ System.exit(-1);
+ }
+
+ File jnlpFile = new File(jnlpTemplateFile);
+ if (!jnlpFile.canRead()) {
+ System.err.println("[ERROR] Unable to read given jnlp file - " + jnlpTemplateFile + ".");
+ System.exit(-1);
+
+ }
+
+ StringBuilder stringBuilder = new StringBuilder();
+
+ // Read all dependencies
+ for (File file : libDirectoryFile.listFiles(new JarFileFilter())) {
+ String line = "<jar href=\"lib/" + file.getName() + "\"/>";
+ stringBuilder.append(line);
+ stringBuilder.append("\n");
+ }
+
+ // System.out.println(stringBuilder.toString());
+ modifyConfigurations(jnlpFile, stringBuilder);
+
+ }
+
+ private static void modifyConfigurations(File jnlpFile, StringBuilder dependencies) {
+
+ List<String> lines = new ArrayList<String>();
+
+ // first, read the file and store the changes
+ BufferedReader in = null;
+ try {
+ in = new BufferedReader(new FileReader(jnlpFile));
+ } catch (FileNotFoundException e) {
+ System.err.println("[ERROR] Error occurred while reading the file. " + e.getMessage());
+ }
+
+ String line = null;
+ if (in != null) {
+ try {
+ line = in.readLine();
+ } catch (IOException e) {
+ System.err.println("[ERROR] Error occurred while reading the file. " + e.getMessage());
+ try {
+ in.close();
+ } catch (IOException e1) {
+ System.err.println("[ERROR] Error occurred while closing the file. " + e.getMessage());
+ }
+ }
+ }
+
+ try {
+ while (line != null) {
+
+ if (line.trim().startsWith(CONFIGURATION_ELEMENT)) {
+ line = line.replaceAll(CONFIGURATION_ELEMENT, dependencies.toString());
+ }
+ lines.add(line);
+ line = in.readLine();
+
+ }
+ } catch (IOException e) {
+ System.err.println("[ERROR] Error occurred while reading the file. " + e.getMessage());
+ } finally {
+ try {
+ if (in != null) {
+ in.close();
+ }
+ } catch (IOException e) {
+ System.err.println("[ERROR] Error occurred while closing the file. " + e.getMessage());
+ }
+ }
+
+ // now, write the file again with the changes
+ PrintWriter out = null;
+ try {
+ out = new PrintWriter(jnlpFile);
+ for (String l : lines) {
+ out.println(l);
+ out.flush();
+ }
+ } catch (FileNotFoundException e) {
+ System.err.println("[ERROR] Error occurred while writing back to the file. " + e.getMessage());
+ } finally {
+ if (out != null) {
+ out.flush();
+ out.close();
+ }
+ }
+
+ }
+
+ public static class JarFileFilter implements FilenameFilter {
+ String ext;
+
+ public JarFileFilter() {
+ this.ext = ".jar";
+ }
+
+ public boolean accept(File dir, String name) {
+ return name.endsWith(ext);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c4f3c662/modules/distribution/xbaya-gui/src/main/resources/INSTALL
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/src/main/resources/INSTALL b/modules/distribution/xbaya-gui/src/main/resources/INSTALL
new file mode 100644
index 0000000..1d6d275
--- /dev/null
+++ b/modules/distribution/xbaya-gui/src/main/resources/INSTALL
@@ -0,0 +1,44 @@
+Installing Apache Airavata XBaya 0.11
+-------------------------------------
+
+Prerequisites
+-------------
+Java 1.5 or later
+Maven (tested on v 3.0.2)
+
+Build Apache Airavata XBaya from Source
+---------------------------------
+* Unzip/untar the source file or check out from svn.
+* cd to project folder and type
+ $ 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/xbaya-gui/target/apache-airavata-xbaya-gui-<airavata-version>-bin.zip
+
+Installing the Airavata XBaya
+-----------------------------
+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 XBaya
+------------------------------
+* Navigate to <XBAYA_HOME>/bin
+* type for following command to start the Airavata XBaya
+ MAC/Unix systems
+ $ sh xbaya-gui.sh
+ Windows
+ > xbaya-gui.bat
+ Note: Pass "-h" as parameters to see more options when starting the server
+
+Running Tests
+-------------
+Once the binary is unzipped, instructions to run the tests should be followed from README
+
+Tutorials
+----------
+The airavata website has instructions for basic tutorials:
+* For basic understanding of how Airavata works - http://airavata.apache.org/documentation/tutorials/airavata-in-5-minutes.html
+* Describing and executing applications using Airavata - http://airavata.apache.org/documentation/tutorials/airavata-in-10-minutes.html
+* Advanced tutorial to provide understanding of how to run sample workflows distributed with Airavata - http://airavata.apache.org/documentation/tutorials/advanced-workflow-samples.html