airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1541651 - in /airavata/trunk/modules/distribution: airavata-client/ airavata-client/src/main/assembly/ airavata-client/src/main/resources/conf/ airavata-server/src/main/assembly/ airavata-server/src/main/resources/conf/ xbaya-gui/ xbaya-gu...
Date Wed, 13 Nov 2013 18:23:58 GMT
Author: chathuri
Date: Wed Nov 13 18:23:58 2013
New Revision: 1541651

URL: http://svn.apache.org/r1541651
Log:
adding thrift dependencies to distribution

Modified:
    airavata/trunk/modules/distribution/airavata-client/pom.xml
    airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
    airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
    airavata/trunk/modules/distribution/xbaya-gui/pom.xml
    airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties

Modified: airavata/trunk/modules/distribution/airavata-client/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/pom.xml?rev=1541651&r1=1541650&r2=1541651&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-client/pom.xml Wed Nov 13 18:23:58 2013
@@ -111,11 +111,17 @@
             <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.3</version>
+            <version>1.6</version>
         </dependency>
         <dependency>
             <groupId>org.python</groupId>
@@ -324,6 +330,11 @@
             <artifactId>jackson-core-asl</artifactId>
             <version>1.9.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.thrift</groupId>
+            <artifactId>libthrift</artifactId>
+            <version>0.9.1</version>
+        </dependency>
 
     </dependencies>
     <properties>

Modified: airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml?rev=1541651&r1=1541650&r2=1541651&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
(original)
+++ airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
Wed Nov 13 18:23:58 2013
@@ -110,6 +110,7 @@
                 <include>org.apache.airavata:airavata-client-api:jar</include>
                 <include>org.apache.airavata:airavata-jpa-registry:jar</include>
                 <include>org.apache.airavata:airavata-rest-client:jar</include>
+                <include>org.apache.airavata:airavata-interpreter-service-client:jar</include>
                 <include>org.apache.openjpa:openjpa-all:jar</include>
                 <include>xerces:xercesImpl:jar:2.9.1</include>
                 <include>com.sun.jersey:jersey-json</include>
@@ -140,6 +141,7 @@
                 <include>log4j:log4j:jar</include>
                 <include>de.odysseus.staxon:staxon:jar:1.2</include>
                 <include>de.odysseus.staxon:staxon-jackson:jar:1.2</include>
+                <include>org.apache.thrift:libthrift:jar:0.9.1</include>
             </includes>
         </dependencySet>
     </dependencySets>

Modified: airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties?rev=1541651&r1=1541650&r2=1541651&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
(original)
+++ airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
Wed Nov 13 18:23:58 2013
@@ -67,3 +67,8 @@ trust.store.password=airavata
 #jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000
 
 #registry.service.wsdl=http://localhost:8080/airavata-server/services/RegistryService?wsdl
+
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
\ No newline at end of file

Modified: airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1541651&r1=1541650&r2=1541651&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
(original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
Wed Nov 13 18:23:58 2013
@@ -243,6 +243,7 @@
                 <include>org.apache.airavata:airavata-rest-mappings:jar</include>
                 <include>org.apache.airavata:airavata-rest-client:jar</include>
                 <include>org.apache.airavata:airavata-embedded-tomcat:jar</include>
+                <include>org.apache.airavata:airavata-interpreter-service:jar</include>
                 <include>org.apache.airavata:airavata-rest-mappings</include>
                 <include>org.apache.airavata:airavata-rest-services</include>
                 <include>org.apache.airavata:airavata-security</include>
@@ -290,6 +291,7 @@
                 <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>
             </includes>
         </dependencySet>
         <dependencySet>

Modified: airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties?rev=1541651&r1=1541650&r2=1541651&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
(original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
Wed Nov 13 18:23:58 2013
@@ -250,4 +250,9 @@ amqp.broadcast.sender=org.apache.airavat
 registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/RegistryService?wsdl
 
 # If false, disables two phase commit when submitting jobs
-TwoPhase=true
\ No newline at end of file
+TwoPhase=true
+
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060
\ No newline at end of file

Modified: airavata/trunk/modules/distribution/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/pom.xml?rev=1541651&r1=1541650&r2=1541651&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/pom.xml Wed Nov 13 18:23:58 2013
@@ -239,11 +239,17 @@
             <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.3</version>
+            <version>1.6</version>
         </dependency>
         <dependency>
             <groupId>org.python</groupId>
@@ -320,13 +326,13 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.1</version>
+            <version>4.3</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.1</version>
+            <version>4.3</version>
             <type>jar</type>
         </dependency>
 
@@ -501,6 +507,11 @@
             <artifactId>guava</artifactId>
             <version>12.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+            <version>1.45</version>
+        </dependency>
     </dependencies>
     <properties>
         <jersey.version>1.13</jersey.version>

Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml?rev=1541651&r1=1541650&r2=1541651&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml Wed Nov
13 18:23:58 2013
@@ -124,6 +124,9 @@
                 <include>org.apache.airavata:airavata-jpa-registry:jar</include>
                 <include>org.apache.airavata:airavata-rest-mappings:jar</include>
                 <include>org.apache.airavata:airavata-rest-client:jar</include>
+                <include>org.apache.airavata:airavata-interpreter-service-client:jar</include>
+                <include>org.apache.airavata:airavata-interpreter-service:jar</include>
+                <include>org.apache.airavata:airavata-interpreter-service-handler:jar</include>
                 <include>org.apache.airavata:airavata-xbaya-gui</include>
                 <include>org.apache.openjpa:openjpa-all:jar</include>
                 <include>com.sun.jersey:jersey-client:jar</include>
@@ -151,8 +154,11 @@
                 <!--<include>org.apache.httpcomponents:httpcore:jar</include>
-->
                 <include>org.apache.axis2:axis2-adb:jar</include>
                 <include>com.google.guava:guava</include>
-                <include>org.apache.httpcomponents:httpcore:jar:4.1</include>
-                <include>org.apache.httpcomponents:httpclient:jar:4.1</include>
+                <include>org.apache.httpcomponents:httpcore:jar:4.3</include>
+                <include>org.apache.httpcomponents:httpclient:jar:4.3</include>
+                <include>org.globusonline:transfer-api-client-java:jar:0.10.8-SNAPSHOT</include>
+                <include>org.bouncycastle:bcprov-jdk16:jar:1.45</include>
+                <include>org.apache.thrift:libthrift:jar:0.9.1</include>
             </includes>
         </dependencySet>
     </dependencySets>

Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties?rev=1541651&r1=1541650&r2=1541651&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
(original)
+++ airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
Wed Nov 13 18:23:58 2013
@@ -64,3 +64,7 @@ trust.store.password=airavata
 #class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 
+###################################################################################
+# Thrift configuration
+###################################################################################
+thrift.server.port=6060



Mime
View raw message