You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/07/01 12:48:09 UTC
git commit: Fixing PHP Client Packaging to properly unpack and
include the required files - AIRAVATA-1274
Repository: airavata
Updated Branches:
refs/heads/master 4d338df24 -> 409c9863e
Fixing PHP Client Packaging to properly unpack and include the required files - AIRAVATA-1274
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/409c9863
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/409c9863
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/409c9863
Branch: refs/heads/master
Commit: 409c9863ed906f7fe151cd483202b12e72d8639b
Parents: 4d338df
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Jul 1 06:48:02 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Jul 1 06:48:02 2014 -0400
----------------------------------------------------------------------
.../airavata-client-sdks/airavata-php-sdk/pom.xml | 10 +++++-----
.../src/main/assembly/bin-assembly.xml | 14 +++++++-------
.../src/main/resources/php-cli-samples/README | 6 ++++--
.../php-cli-samples/airavata-client-properties.ini | 12 +++---------
4 files changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/409c9863/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
index 5568b90..490acfc 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
@@ -17,8 +17,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>apache-airavata-client-php-sdk</artifactId>
- <name>Airavata Client PHP SDK</name>
+ <artifactId>apache-airavata-php-sdk</artifactId>
+ <name>Apache Airavata PHP SDK</name>
<packaging>pom</packaging>
<url>http://airavata.apache.org/</url>
@@ -60,7 +60,7 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>${archieve.name}-${project.version}</finalName>
+ <finalName>${archive.name}-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
</descriptors>
@@ -105,9 +105,9 @@
<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-airavata-client</archieve.name>
+ <archive.name>apache-airavata-php-sdk</archive.name>
<used.axis2.release>${axis2.version}</used.axis2.release>
- <airavata.client-dist.name>${archieve.name}-${project.version}</airavata.client-dist.name>
+ <airavata.client-dist.name>${archive.name}-${project.version}</airavata.client-dist.name>
<airavata.client-bin.zip>${project.build.directory}/${airavata.client-dist.name}-bin.zip</airavata.client-bin.zip>
<airavata.client-bin.tar.gz>${project.build.directory}/${airavata.client-dist.name}-bin.tar.gz</airavata.client-bin.tar.gz>
</properties>
http://git-wip-us.apache.org/repos/asf/airavata/blob/409c9863/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/assembly/bin-assembly.xml b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/assembly/bin-assembly.xml
index 5f7ae03..33d5ffe 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/assembly/bin-assembly.xml
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/assembly/bin-assembly.xml
@@ -25,7 +25,7 @@
<assembly>
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>${archieve.name}-${version}</baseDirectory>
+ <baseDirectory>${archive.name}-${version}</baseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
@@ -34,7 +34,7 @@
<!-- ********************** copy release notes files ********************** -->
<fileSet>
<directory>../../../</directory>
- <outputDirectory>.</outputDirectory>
+ <outputDirectory>${archive.name}-${version}</outputDirectory>
<includes>
<include>RELEASE_NOTES</include>
</includes>
@@ -42,22 +42,22 @@
<!-- ********************** copy licenses, readme etc. ********************** -->
<fileSet>
<directory>src/main/resources/</directory>
- <outputDirectory>.</outputDirectory>
+ <outputDirectory>${archive.name}-${version}</outputDirectory>
<includes>
- <include>conf/*</include>
- <include>lib/*</include>
+ <include>php-cli-samples/*</include>
+ <include>lib/*</include>
<include>LICENSE</include>
<include>NOTICE</include>
<include>README</include>
<include>INSTALL</include>
</includes>
</fileSet>
- <fileSet>
+<!-- <fileSet>
<directory>${project.build.directory}/conf</directory>
<outputDirectory>conf</outputDirectory>
<includes>
<include>*.properties</include>
</includes>
- </fileSet>
+ </fileSet>-->
</fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/airavata/blob/409c9863/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/README
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/README b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/README
index 8684750..1f86c3f 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/README
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/README
@@ -1,5 +1,7 @@
-This directory contains files that can be used to test the Apache Airavata client API using PHP command-line tools. You will need PHP installed on your test environment. To run a command from a terminal shell prompt, use, for example,
- [prompt%> php createProject.php your-name
+This directory contains files that can be used to test the Apache Airavata client API using PHP command-line tools.
+ You will need PHP installed on your test environment.
+ To run a command from a terminal shell prompt, use, for example:
+ [prompt%> php createProject.php project-name
You can modify PHP files using any text editor.
http://git-wip-us.apache.org/repos/asf/airavata/blob/409c9863/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/airavata-client-properties.ini
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/airavata-client-properties.ini b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/airavata-client-properties.ini
index 4e24eaa..1a94ffd 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/airavata-client-properties.ini
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/php-cli-samples/airavata-client-properties.ini
@@ -2,10 +2,10 @@
; Key properties specify location of Airavata Services, Ports and Such.
; library path to Thrift Libraries
-THRIFT_LIB_DIR = "../../airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Thrift/"
+THRIFT_LIB_DIR = "../lib/Thrift/"
; library of thrift generated Airavata API PHP Stubs
-AIRAVATA_PHP_STUBS_DIR = "../../airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/"
+AIRAVATA_PHP_STUBS_DIR = "../lib/Airavata/"
; Host which runs the Airavata Server
; AIRAVATA_SERVER = "gw111.iu.xsede.org"
@@ -15,10 +15,4 @@ AIRAVATA_SERVER = "localhost"
AIRAVATA_PORT = 8930
; Time out value to give enough breathing room for client to get synchronous responses back
-AIRAVATA_TIMEOUT = 5000
-
-; Host which runs the Application Catalog Server
-APP_CATALOG_SERVER = "gw111.iu.xsede.org"
-
-; Application Catalog Server thrift port
-APP_CATALOG_PORT = 8931
+AIRAVATA_TIMEOUT = 5000
\ No newline at end of file