Repository: airavata Updated Branches: refs/heads/master b4a34fac1 -> be21587b6
Clean up the distribution creation. Now we need not to change distribution poms or assembly xml files if you add new jars to your project. GFAC distribution can be modifited easily to create different GFAC flavers. AIRAVATA-1471 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/be21587b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/be21587b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/be21587b Branch: refs/heads/master Commit: be21587b652b8b1a46851824076fe44e7ac8f522 Parents: b4a34fa Author: raminder <[email protected]> Authored: Mon Nov 17 15:36:48 2014 -0500 Committer: raminder <[email protected]> Committed: Mon Nov 17 15:36:48 2014 -0500 ---------------------------------------------------------------------- modules/distribution/api-server/pom.xml | 51 ---- .../src/main/resources/bin/setenv.bat | 43 +++ .../api-server/src/main/resources/bin/setenv.sh | 77 +++++ modules/distribution/gfac-server/pom.xml | 304 ------------------- .../src/main/resources/bin/setenv.bat | 43 +++ .../src/main/resources/bin/setenv.sh | 77 +++++ .../distribution/orchestrator-server/pom.xml | 174 ----------- .../src/main/resources/bin/setenv.bat | 43 +++ .../src/main/resources/bin/setenv.sh | 77 +++++ modules/distribution/xbaya-gui/pom.xml | 214 ------------- 10 files changed, 360 insertions(+), 743 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/be21587b/modules/distribution/api-server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/api-server/pom.xml b/modules/distribution/api-server/pom.xml index ca2d60d..9a77bfe 100644 --- a/modules/distribution/api-server/pom.xml +++ b/modules/distribution/api-server/pom.xml @@ -138,57 +138,6 @@ <artifactId>airavata-api-server</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-data-models</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-model-utils</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-jpa-registry</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-cpi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-data</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - <version>${thrift.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <!-- zookeeper dependencies --> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>3.4.0</version> - </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/airavata/blob/be21587b/modules/distribution/api-server/src/main/resources/bin/setenv.bat ---------------------------------------------------------------------- diff --git a/modules/distribution/api-server/src/main/resources/bin/setenv.bat b/modules/distribution/api-server/src/main/resources/bin/setenv.bat new file mode 100644 index 0000000..223f8cd --- /dev/null +++ b/modules/distribution/api-server/src/main/resources/bin/setenv.bat @@ -0,0 +1,43 @@ +rem Licensed to the Apache Software Foundation (ASF) under one +rem or more contributor license agreements. See the NOTICE file +rem distributed with this work for additional information +rem regarding copyright ownership. The ASF licenses this file +rem to you under the Apache License, Version 2.0 (the +rem "License"); you may not use this file except in compliance +rem with the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, +rem software distributed under the License is distributed on an +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +rem KIND, either express or implied. See the License for the +rem specific language governing permissions and limitations +rem under the License. + +@echo off + +:checkJava +if "%JAVA_HOME%" == "" goto noJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +goto initialize + +:noJavaHome +echo You must set the JAVA_HOME environment variable before running Airavata. +goto end + +:initialize +if "%AIRAVATA_HOME%"=="" set AIRAVATA_HOME=%~sdp0.. +SET curDrive=%cd:~0,1% +SET airavataDrive=%AIRAVATA_HOME:~0,1% +if not "%curDrive%" == "%airavataDrive%" %airavataDrive%: +goto updateClasspath + +rem ----- update classpath ----------------------------------------------------- +:updateClasspath +cd %AIRAVATA_HOME% +set XBAYA_CLASSPATH= +FOR %%C in ("%AIRAVATA_HOME%\lib\*.jar") DO set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\lib\%%~nC%%~xC +FOR %%C in ("%AIRAVATA_HOME%\repository\services\*.jar") DO set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\repository\services\%%~nC%%~xC + +:end \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/be21587b/modules/distribution/api-server/src/main/resources/bin/setenv.sh ---------------------------------------------------------------------- diff --git a/modules/distribution/api-server/src/main/resources/bin/setenv.sh b/modules/distribution/api-server/src/main/resources/bin/setenv.sh new file mode 100755 index 0000000..84673db --- /dev/null +++ b/modules/distribution/api-server/src/main/resources/bin/setenv.sh @@ -0,0 +1,77 @@ +#!/bin/sh + +# 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. + + +# Get standard environment variables +# if JAVA_HOME is not set we're not happy +if [ -z "$JAVA_HOME" ]; then + echo "You must set the JAVA_HOME variable before running Airavata Scripts." + exit 1 +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +os400=false +case "`uname`" in +CYGWIN*) cygwin=true;; +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + + +PRGDIR=`dirname "$PRG"` + +# Only set AIRAVATA_HOME if not already set +[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd` + +XBAYA_CLASSPATH="" + + + +for f in "$AIRAVATA_HOME"/lib/*.jar +do + XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f +done + +for f in "$AIRAVATA_HOME"/repository/services/*.jar +do + XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f +done + +XBAYA_CLASSPATH="$XBAYA_HOME":"$XBAYA_HOME/conf":"$XBAYA_CLASSPATH":"$CLASSPATH" + + + + +export AIRAVATA_HOME +export XBAYA_CLASSPATH + + http://git-wip-us.apache.org/repos/asf/airavata/blob/be21587b/modules/distribution/gfac-server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/gfac-server/pom.xml b/modules/distribution/gfac-server/pom.xml index 38d8acd..c649630 100644 --- a/modules/distribution/gfac-server/pom.xml +++ b/modules/distribution/gfac-server/pom.xml @@ -128,143 +128,7 @@ </build> <dependencies> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby.version}</version> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</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.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - <version>${jcr.version}</version> - </dependency> <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> - <dependency> - <groupId>org.ogce</groupId> - <artifactId>atomixmiser</artifactId> - <version>${atomixmiser.version}</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-standalone-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-cpi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-messaging-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-data</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-gfac-schema-utils</artifactId>--> - <!--<version>${project.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-registry-cpi</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-data-models</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-credential-store</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-ssh</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-gfac-gram</artifactId> <version>${project.version}</version> @@ -304,183 +168,15 @@ <artifactId>airavata-gfac-service</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-workflow-model-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-messenger-commons</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-messenger-client</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>gsissh</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-model-utils</artifactId> - <version>${project.version}</version> - </dependency> - - <!--dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>apache-airavata-samples</artifactId> - <type>zip</type> - <version>${project.version}</version> - </dependency--> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> - </dependency> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-all</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - <version>3.4.4</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>12.0</version> - </dependency> - - <!-- Hadoop provider related dependencies --> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.whirr</groupId> - <artifactId>whirr-core</artifactId> - <version>0.7.1</version> - </dependency> - <dependency> - <groupId>org.apache.whirr</groupId> - <artifactId>whirr-hadoop</artifactId> - <version>0.7.1</version> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.8.5</version> - </dependency> - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - <version>1.7</version> - </dependency> - <dependency> - <groupId>net.sf.jopt-simple</groupId> - <artifactId>jopt-simple</artifactId> - <version>3.2</version> - </dependency> - <dependency> - <groupId>org.ebaysf.web</groupId> - <artifactId>cors-filter</artifactId> - <version>${ebay.cors.filter}</version> - </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - <version>0.1.50</version> - </dependency> - <dependency> - <groupId>org.ogce</groupId> - <artifactId>bcgss</artifactId> - <version>146</version> - </dependency> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>${xmlbeans.version}</version> - </dependency> - <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - <version>0.9.1</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>2.0.0</version> - </dependency> - <!-- zookeeper dependencies --> - - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>3.4.0</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - </dependency> - - <dependency> - <groupId>com.rabbitmq</groupId> - <artifactId>amqp-client</artifactId> - <version>3.2.3</version> - </dependency> </dependencies> <properties> - <jersey.version>1.13</jersey.version> - <grizzly.version>2.0.0-M3</grizzly.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <archieve.name>apache-gfac-server</archieve.name> - <used.axis2.release>${axis2.version}</used.axis2.release> <airavata.dist.name>${archieve.name}-${project.version}</airavata.dist.name> <airavata.work.dir>${project.build.directory}/tests/${airavata.dist.name}</airavata.work.dir> <airavata.bin.zip>${project.build.directory}/${airavata.dist.name}-bin.zip</airavata.bin.zip> <airavata.bin.tar.gz>${project.build.directory}/${airavata.dist.name}-bin.tar.gz</airavata.bin.tar.gz> - <airavata.webapp.dir>${project.build.directory}/airavata-axis2</airavata.webapp.dir> - <!--airavata.war.dir>${project.build.directory}/test</airavata.war.dir> - <airavata.webapp.war.zip>${project.build.directory}/${airavata.dist.name}.war.zip</airavata.webapp.war.zip> - <airavata.webapp.war.tar.gz>${project.build.directory}/${airavata.dist.name}.war.tar.gz</airavata.webapp.war.tar.gz--> </properties> </project> http://git-wip-us.apache.org/repos/asf/airavata/blob/be21587b/modules/distribution/gfac-server/src/main/resources/bin/setenv.bat ---------------------------------------------------------------------- diff --git a/modules/distribution/gfac-server/src/main/resources/bin/setenv.bat b/modules/distribution/gfac-server/src/main/resources/bin/setenv.bat new file mode 100644 index 0000000..223f8cd --- /dev/null +++ b/modules/distribution/gfac-server/src/main/resources/bin/setenv.bat @@ -0,0 +1,43 @@ +rem Licensed to the Apache Software Foundation (ASF) under one +rem or more contributor license agreements. See the NOTICE file +rem distributed with this work for additional information +rem regarding copyright ownership. The ASF licenses this file +rem to you under the Apache License, Version 2.0 (the +rem "License"); you may not use this file except in compliance +rem with the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, +rem software distributed under the License is distributed on an +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +rem KIND, either express or implied. See the License for the +rem specific language governing permissions and limitations +rem under the License. + +@echo off + +:checkJava +if "%JAVA_HOME%" == "" goto noJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +goto initialize + +:noJavaHome +echo You must set the JAVA_HOME environment variable before running Airavata. +goto end + +:initialize +if "%AIRAVATA_HOME%"=="" set AIRAVATA_HOME=%~sdp0.. +SET curDrive=%cd:~0,1% +SET airavataDrive=%AIRAVATA_HOME:~0,1% +if not "%curDrive%" == "%airavataDrive%" %airavataDrive%: +goto updateClasspath + +rem ----- update classpath ----------------------------------------------------- +:updateClasspath +cd %AIRAVATA_HOME% +set XBAYA_CLASSPATH= +FOR %%C in ("%AIRAVATA_HOME%\lib\*.jar") DO set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\lib\%%~nC%%~xC +FOR %%C in ("%AIRAVATA_HOME%\repository\services\*.jar") DO set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\repository\services\%%~nC%%~xC + +:end \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/be21587b/modules/distribution/gfac-server/src/main/resources/bin/setenv.sh ---------------------------------------------------------------------- diff --git a/modules/distribution/gfac-server/src/main/resources/bin/setenv.sh b/modules/distribution/gfac-server/src/main/resources/bin/setenv.sh new file mode 100755 index 0000000..84673db --- /dev/null +++ b/modules/distribution/gfac-server/src/main/resources/bin/setenv.sh @@ -0,0 +1,77 @@ +#!/bin/sh + +# 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. + + +# Get standard environment variables +# if JAVA_HOME is not set we're not happy +if [ -z "$JAVA_HOME" ]; then + echo "You must set the JAVA_HOME variable before running Airavata Scripts." + exit 1 +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +os400=false +case "`uname`" in +CYGWIN*) cygwin=true;; +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + + +PRGDIR=`dirname "$PRG"` + +# Only set AIRAVATA_HOME if not already set +[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd` + +XBAYA_CLASSPATH="" + + + +for f in "$AIRAVATA_HOME"/lib/*.jar +do + XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f +done + +for f in "$AIRAVATA_HOME"/repository/services/*.jar +do + XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f +done + +XBAYA_CLASSPATH="$XBAYA_HOME":"$XBAYA_HOME/conf":"$XBAYA_CLASSPATH":"$CLASSPATH" + + + + +export AIRAVATA_HOME +export XBAYA_CLASSPATH + + http://git-wip-us.apache.org/repos/asf/airavata/blob/be21587b/modules/distribution/orchestrator-server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/orchestrator-server/pom.xml b/modules/distribution/orchestrator-server/pom.xml index cb84c69..3870f79 100644 --- a/modules/distribution/orchestrator-server/pom.xml +++ b/modules/distribution/orchestrator-server/pom.xml @@ -133,193 +133,19 @@ <dependencies> <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby.version}</version> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</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.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - <version>${jcr.version}</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-standalone-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-cpi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-messaging-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>app-catalog-data</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-orchestrator-service</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-orchestrator-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-registry-cpi</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-data-models</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-credential-store</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-workflow-model-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-messenger-commons</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-messenger-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-model-utils</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.openjpa</groupId> - <artifactId>openjpa-all</artifactId> - <version>2.2.0</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>12.0</version> - </dependency> - <!-- zookeeper dependencies --> - - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>3.4.0</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - </dependency> - - <dependency> - <groupId>com.rabbitmq</groupId> - <artifactId>amqp-client</artifactId> - <version>3.2.3</version> - </dependency> </dependencies> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <archieve.name>apache-orchestrator-server</archieve.name> - <used.axis2.release>${axis2.version}</used.axis2.release> <airavata.dist.name>${archieve.name}-${project.version}</airavata.dist.name> <airavata.work.dir>${project.build.directory}/tests/${airavata.dist.name}</airavata.work.dir> <airavata.bin.zip>${project.build.directory}/${airavata.dist.name}-bin.zip</airavata.bin.zip> <airavata.bin.tar.gz>${project.build.directory}/${airavata.dist.name}-bin.tar.gz</airavata.bin.tar.gz> - <airavata.webapp.dir>${project.build.directory}/airavata-axis2</airavata.webapp.dir> - <!--airavata.war.dir>${project.build.directory}/test</airavata.war.dir> - <airavata.webapp.war.zip>${project.build.directory}/${airavata.dist.name}.war.zip</airavata.webapp.war.zip> - <airavata.webapp.war.tar.gz>${project.build.directory}/${airavata.dist.name}.war.tar.gz</airavata.webapp.war.tar.gz --> </properties> </project> http://git-wip-us.apache.org/repos/asf/airavata/blob/be21587b/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.bat ---------------------------------------------------------------------- diff --git a/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.bat b/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.bat new file mode 100644 index 0000000..223f8cd --- /dev/null +++ b/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.bat @@ -0,0 +1,43 @@ +rem Licensed to the Apache Software Foundation (ASF) under one +rem or more contributor license agreements. See the NOTICE file +rem distributed with this work for additional information +rem regarding copyright ownership. The ASF licenses this file +rem to you under the Apache License, Version 2.0 (the +rem "License"); you may not use this file except in compliance +rem with the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, +rem software distributed under the License is distributed on an +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +rem KIND, either express or implied. See the License for the +rem specific language governing permissions and limitations +rem under the License. + +@echo off + +:checkJava +if "%JAVA_HOME%" == "" goto noJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +goto initialize + +:noJavaHome +echo You must set the JAVA_HOME environment variable before running Airavata. +goto end + +:initialize +if "%AIRAVATA_HOME%"=="" set AIRAVATA_HOME=%~sdp0.. +SET curDrive=%cd:~0,1% +SET airavataDrive=%AIRAVATA_HOME:~0,1% +if not "%curDrive%" == "%airavataDrive%" %airavataDrive%: +goto updateClasspath + +rem ----- update classpath ----------------------------------------------------- +:updateClasspath +cd %AIRAVATA_HOME% +set XBAYA_CLASSPATH= +FOR %%C in ("%AIRAVATA_HOME%\lib\*.jar") DO set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\lib\%%~nC%%~xC +FOR %%C in ("%AIRAVATA_HOME%\repository\services\*.jar") DO set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\repository\services\%%~nC%%~xC + +:end \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/be21587b/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.sh ---------------------------------------------------------------------- diff --git a/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.sh b/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.sh new file mode 100755 index 0000000..84673db --- /dev/null +++ b/modules/distribution/orchestrator-server/src/main/resources/bin/setenv.sh @@ -0,0 +1,77 @@ +#!/bin/sh + +# 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. + + +# Get standard environment variables +# if JAVA_HOME is not set we're not happy +if [ -z "$JAVA_HOME" ]; then + echo "You must set the JAVA_HOME variable before running Airavata Scripts." + exit 1 +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +os400=false +case "`uname`" in +CYGWIN*) cygwin=true;; +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + + +PRGDIR=`dirname "$PRG"` + +# Only set AIRAVATA_HOME if not already set +[ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd` + +XBAYA_CLASSPATH="" + + + +for f in "$AIRAVATA_HOME"/lib/*.jar +do + XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f +done + +for f in "$AIRAVATA_HOME"/repository/services/*.jar +do + XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f +done + +XBAYA_CLASSPATH="$XBAYA_HOME":"$XBAYA_HOME/conf":"$XBAYA_CLASSPATH":"$CLASSPATH" + + + + +export AIRAVATA_HOME +export XBAYA_CLASSPATH + + http://git-wip-us.apache.org/repos/asf/airavata/blob/be21587b/modules/distribution/xbaya-gui/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/xbaya-gui/pom.xml b/modules/distribution/xbaya-gui/pom.xml index cb4de69..11dd61b 100644 --- a/modules/distribution/xbaya-gui/pom.xml +++ b/modules/distribution/xbaya-gui/pom.xml @@ -236,225 +236,11 @@ </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>
