Repository: airavata
Updated Branches:
  refs/heads/master 5a807789e -> c6d450e21


https://issues.apache.org/jira/browse/AIRAVATA-1060


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/76c31db5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/76c31db5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/76c31db5

Branch: refs/heads/master
Commit: 76c31db500c5470e19d6b761ea3b21f755ba3ef1
Parents: e40016d
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Wed Mar 5 23:25:30 2014 -0500
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Wed Mar 5 23:25:30 2014 -0500

----------------------------------------------------------------------
 .../common/utils/ApplicationSettings.java       |  4 ++
 .../src/main/assembly/bin-assembly.xml          |  1 -
 modules/distribution/airavata-server/pom.xml    |  8 +--
 .../src/main/assembly/bin-assembly.xml          |  9 ---
 modules/distribution/release/pom.xml            | 14 -----
 modules/distribution/xbaya-gui/pom.xml          |  5 --
 .../src/main/assembly/bin-assembly.xml          |  2 -
 modules/integration-tests/pom.xml               | 60 ++------------------
 modules/xbaya-gui/pom.xml                       |  5 --
 pom.xml                                         |  2 +-
 .../airavata-client/create-application/pom.xml  | 23 --------
 samples/airavata-client/workflow-run/pom.xml    | 23 --------
 samples/gateway-developer-guide/pom.xml         | 11 ----
 13 files changed, 13 insertions(+), 154 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
index db019c4..c20dc32 100644
--- a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
+++ b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
@@ -227,4 +227,8 @@ public abstract class ApplicationSettings {
     public static Properties getProperties() {
         return properties;
     }
+    
+    public static void mergeSettings(Properties properties){
+    	properties.putAll(properties);
+    }
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml b/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
index 073f140..bb7b4ba 100644
--- a/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
@@ -126,7 +126,6 @@
                 <include>org.codehaus.jackson:jackson-xc</include>
                 <include>com.sun.jersey:jersey-core:jar</include>
                 <include>com.sun.jersey:jersey-client:jar</include>
-                <include>org.apache.airavata:airavata-rest-mappings:jar</include>
                 <include>org.apache.airavata:json</include>
                 <include>commons-codec:commons-codec:jar</include>
                 <include>wsdl4j:wsdl4j:jar</include>

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/modules/distribution/airavata-server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/pom.xml b/modules/distribution/airavata-server/pom.xml
index 06ea0e8..5ae7aff 100644
--- a/modules/distribution/airavata-server/pom.xml
+++ b/modules/distribution/airavata-server/pom.xml
@@ -24,7 +24,7 @@
 
     <build>
         <plugins>
-            <plugin>
+            <!--plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <version>2.4</version>
@@ -78,7 +78,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin-->
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
@@ -622,8 +622,8 @@
         <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.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>
+        <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/76c31db5/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml b/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
index 399e0f0..4943e8e 100644
--- a/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
@@ -104,15 +104,6 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../../rest/webapp/src/main/resources
-            </directory>
-            <outputDirectory>bin
-            </outputDirectory>
-            <includes>
-                <include>authenticators.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
             <directory>src/main/resources/bin</directory>
             <outputDirectory>bin</outputDirectory>
             <fileMode>777</fileMode>

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/modules/distribution/release/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/release/pom.xml b/modules/distribution/release/pom.xml
index cbafdb5..7f51fe6 100644
--- a/modules/distribution/release/pom.xml
+++ b/modules/distribution/release/pom.xml
@@ -52,20 +52,6 @@
 									<type>tar.gz</type>
 									<classifier>bin</classifier>
 								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.airavata</groupId>
-									<artifactId>apache-airavata-server</artifactId>
-						            <version>${project.version}</version>
-									<type>zip</type>
-									<classifier>war</classifier>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.airavata</groupId>
-									<artifactId>apache-airavata-server</artifactId>
-						            <version>${project.version}</version>
-									<type>tar.gz</type>
-									<classifier>war</classifier>
-								</artifactItem>
 								<!--Airavata Client Distributions-->
 								<artifactItem>
 									<groupId>org.apache.airavata</groupId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/modules/distribution/xbaya-gui/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/pom.xml b/modules/distribution/xbaya-gui/pom.xml
index 3f80af5..6933597 100644
--- a/modules/distribution/xbaya-gui/pom.xml
+++ b/modules/distribution/xbaya-gui/pom.xml
@@ -393,11 +393,6 @@
             <artifactId>airavata-registry-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-rest-client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <!-- JCR Support -->
         <!-- TODO need clean up -->

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/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
index 2be29a3..a143ef7 100644
--- a/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
@@ -124,8 +124,6 @@
                 <include>org.apache.airavata:airavata-message-monitor:jar</include>
                 <include>org.apache.airavata:airavata-client-api:jar</include>
                 <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>

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/modules/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index d0e89d7..bf12d27 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -23,7 +23,7 @@
     
     <build>
         <plugins>
-            <plugin>
+            <!--plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <version>2.8</version>
@@ -94,13 +94,12 @@
 				    <additionalClasspathElement>${project.build.directory}/samples/workflows</additionalClasspathElement>
 				  </additionalClasspathElements>
 				</configuration>
-			</plugin>
-            <plugin>
+			</plugin-->
+            <!--plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>
                 <version>1.3.1</version>
                 <configuration>
-                    <!--wait>true</wait-->
 
                     <container>
                         <containerId>tomcat${major.tomcat.version}x</containerId>
@@ -142,46 +141,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.5</version>
-                <configuration>
-                    <failIfNoTests>false</failIfNoTests>
-                    <systemPropertyVariables>
-                        <test.server.port>${test.running.port}</test.server.port>
-                        <test.server.url>localhost</test.server.url>
-                        <test.server.context>${rest.service.context}</test.server.context>
-                        <log4j.configuration>file:${basedir}/src/test/resources/log4j.properties</log4j.configuration>
-                        <property>
-                            <name>log4j.configuration</name>
-                            <value>file:${project.build.directory}/test-classes/log4j.properties</value>
-                        </property>
-                    </systemPropertyVariables>
-
-                    <includes>
-                        <include>**/*IT.java</include>
-                    </includes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>integration-test</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>verify</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+            </plugin-->
         </plugins>
     </build>
 
@@ -222,17 +182,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-rest-client</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-jpa-registry</artifactId>
             <version>${project.version}</version>
             <exclusions>
@@ -341,7 +290,6 @@
         <test.running.port>8080</test.running.port>
 		<tomcat.extract.dir>${project.build.directory}</tomcat.extract.dir>
         <tomcat.work.dir>${tomcat.extract.dir}/apache-tomcat-${tomcat.version}</tomcat.work.dir>
-        <rest.service.context>airavata</rest.service.context>
         <local.tomcat.distribution>${settings.localRepository}/org/apache/airavata/integration/tomcat/apache-tomcat/${tomcat.version}/apache-tomcat-${tomcat.version}.zip</local.tomcat.distribution>
     </properties>
 </project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/modules/xbaya-gui/pom.xml
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/pom.xml b/modules/xbaya-gui/pom.xml
index 6341584..09cdbec 100644
--- a/modules/xbaya-gui/pom.xml
+++ b/modules/xbaya-gui/pom.xml
@@ -261,11 +261,6 @@
             <artifactId>airavata-registry-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-rest-client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <!-- JCR Support -->
         <!-- TODO need clean up -->

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a02cb37..e528a82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -455,7 +455,7 @@
                 <!--module>modules/rest</module-->
                 <module>modules/orchestrator</module>
                 <module>tools</module>
-                <module>samples</module>
+                <!--module>samples</module-->
                 <module>modules/server</module>
                 <module>modules/test-suite</module>
                 <module>modules/distribution</module>

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/samples/airavata-client/create-application/pom.xml
----------------------------------------------------------------------
diff --git a/samples/airavata-client/create-application/pom.xml b/samples/airavata-client/create-application/pom.xml
index 63f2115..002091f 100644
--- a/samples/airavata-client/create-application/pom.xml
+++ b/samples/airavata-client/create-application/pom.xml
@@ -35,18 +35,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-rest-service-webapp</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-webapp</artifactId>
             <version>${axis2.version}</version>
@@ -60,17 +48,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-rest-client</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-jpa-registry</artifactId>
             <version>${project.version}</version>
             <exclusions>

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/samples/airavata-client/workflow-run/pom.xml
----------------------------------------------------------------------
diff --git a/samples/airavata-client/workflow-run/pom.xml b/samples/airavata-client/workflow-run/pom.xml
index 7baeb36..8d76e95 100644
--- a/samples/airavata-client/workflow-run/pom.xml
+++ b/samples/airavata-client/workflow-run/pom.xml
@@ -35,18 +35,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-rest-service-webapp</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-webapp</artifactId>
             <version>${axis2.version}</version>
@@ -60,17 +48,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-rest-client</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-jpa-registry</artifactId>
             <version>${project.version}</version>
             <exclusions>

http://git-wip-us.apache.org/repos/asf/airavata/blob/76c31db5/samples/gateway-developer-guide/pom.xml
----------------------------------------------------------------------
diff --git a/samples/gateway-developer-guide/pom.xml b/samples/gateway-developer-guide/pom.xml
index d005ffc..9ef7caf 100644
--- a/samples/gateway-developer-guide/pom.xml
+++ b/samples/gateway-developer-guide/pom.xml
@@ -25,17 +25,6 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-rest-client</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-jpa-registry</artifactId>
             <version>${project.version}</version>
             <exclusions>