Return-Path: 
 <commits-return-5557-apmail-airavata-commits-archive=airavata.apache.org@airavata.apache.org>
X-Original-To: apmail-airavata-commits-archive@www.apache.org
Delivered-To: apmail-airavata-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id D6643100DE
	for <apmail-airavata-commits-archive@www.apache.org>;
 Fri,  4 Apr 2014 13:23:03 +0000 (UTC)
Received: (qmail 31881 invoked by uid 500); 4 Apr 2014 13:23:02 -0000
Delivered-To: apmail-airavata-commits-archive@airavata.apache.org
Received: (qmail 31776 invoked by uid 500); 4 Apr 2014 13:23:00 -0000
Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@airavata.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@airavata.apache.org>
List-Post: <mailto:commits@airavata.apache.org>
List-Id: <commits.airavata.apache.org>
Reply-To: dev@airavata.apache.org
Delivered-To: mailing list commits@airavata.apache.org
Received: (qmail 31587 invoked by uid 99); 4 Apr 2014 13:22:51 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2014 13:22:51 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 21FA994A75F; Fri,  4 Apr 2014 13:22:51 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: lahiru@apache.org
To: commits@airavata.apache.org
Date: Fri, 04 Apr 2014 13:22:54 -0000
Message-Id: <08a56e7cd6bd46c2a223952add966ad4@git.apache.org>
In-Reply-To: <aad7ecd512e24513b02adeea5ed69df8@git.apache.org>
References: <aad7ecd512e24513b02adeea5ed69df8@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [4/4] git commit: fixing the merge

fixing the merge


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

Branch: refs/heads/master
Commit: 9ab16b97e47ca8dc5b981de7944f8a2a54bad745
Parents: 9c55545 a2dcc36
Author: lahiru <lahiru@apache.org>
Authored: Fri Apr 4 09:22:39 2014 -0400
Committer: lahiru <lahiru@apache.org>
Committed: Fri Apr 4 09:22:39 2014 -0400

----------------------------------------------------------------------
 README                                          |    3 +
 .../java-client-samples/pom.xml                 |    5 +
 .../main/resources/airavata-client.properties   |   77 -
 modules/airavata-client/pom.xml                 |    5 +
 .../main/resources/airavata-client.properties   |   76 -
 .../common/utils/ApplicationSettingsTest.java   |    6 +-
 .../test/resources/airavata-server.properties   |  118 +-
 modules/configuration/client/pom.xml            |   24 +
 .../main/resources/airavata-client.properties   |   77 +
 .../client/src/main/resources/log4j.properties  |   40 +
 modules/configuration/pom.xml                   |   40 +
 modules/configuration/server/pom.xml            |   24 +
 .../server/src/main/resources/PBSTemplate.xslt  |   77 +
 .../server/src/main/resources/SGETemplate.xslt  |   79 +
 .../src/main/resources/SLURMTemplate.xslt       |   69 +
 .../main/resources/airavata-server.properties   |  283 +++
 .../server/src/main/resources/airavata.jks      |  Bin 0 -> 501 bytes
 .../server/src/main/resources/axis2.xml         |  533 ++++
 .../server/src/main/resources/gfac-config.xml   |  101 +
 .../server/src/main/resources/gsissh.properties |   26 +
 .../server/src/main/resources/host.xml          |   86 +
 .../server/src/main/resources/log4j.properties  |   41 +
 modules/distribution/airavata-client/pom.xml    |   30 +-
 .../src/main/assembly/bin-assembly.xml          |    8 +-
 .../resources/conf/airavata-client.properties   |   77 -
 .../src/main/resources/conf/log4j.properties    |   40 -
 modules/distribution/airavata-server/pom.xml    |  110 +-
 .../src/main/assembly/bin-assembly.xml          |   24 +-
 .../src/main/resources/conf/PBSTemplate.xslt    |   77 -
 .../src/main/resources/conf/SGETemplate.xslt    |   79 -
 .../src/main/resources/conf/SLURMTemplate.xslt  |   69 -
 .../resources/conf/airavata-server.properties   |  283 ---
 .../src/main/resources/conf/airavata.jks        |  Bin 501 -> 0 bytes
 .../src/main/resources/conf/axis2.xml           |  533 ----
 .../src/main/resources/conf/gfac-config.xml     |  101 -
 .../src/main/resources/conf/gsissh.properties   |   26 -
 .../src/main/resources/conf/host.xml            |   86 -
 .../src/main/resources/conf/log4j.properties    |   41 -
 .../src/main/resources/war/INSTALL              |   55 -
 .../src/main/resources/war/LICENSE              | 2387 ------------------
 .../src/main/resources/war/NOTICE               |  163 --
 .../src/main/resources/war/README               |  121 -
 modules/distribution/xbaya-gui/pom.xml          |   30 +-
 .../src/main/assembly/bin-assembly.xml          |    8 +-
 .../resources/conf/airavata-client.properties   |   66 -
 .../src/main/resources/conf/log4j.properties    |   40 -
 .../orchestrator-client-sdks/pom.xml            |    5 +
 .../main/resources/airavata-client.properties   |   77 -
 modules/server/pom.xml                          |    5 +
 .../main/resources/airavata-server.properties   |  277 --
 modules/xbaya-gui/pom.xml                       |    5 +
 .../main/resources/airavata-client.properties   |   80 -
 pom.xml                                         |    1 +
 53 files changed, 1694 insertions(+), 5000 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/9ab16b97/modules/server/pom.xml
----------------------------------------------------------------------
diff --cc modules/server/pom.xml
index 893ae79,784cec5..19b1340
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@@ -50,5 -50,30 +50,10 @@@
              <artifactId>airavata-api-server</artifactId>
              <version>${project.version}</version>
          </dependency>
+ 	<dependency>
+             <groupId>org.apache.airavata</groupId>
+             <artifactId>airavata-server-configuration</artifactId>
+             <version>${project.version}</version>
+         </dependency>
      </dependencies>
 -    
 -    <build>
 -        <plugins>
 -            <plugin>
 -                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-surefire-plugin</artifactId>
 -                <version>${surefire.version}</version>
 -                <configuration>
 -                    <testSourceDirectory>${basedir}\src\test\java\</testSourceDirectory>
 -                </configuration>
 -            </plugin>
 -        </plugins>
 -        <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
 -        <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
 -        <testResources>
 -            <testResource>
 -                <directory>${project.basedir}/src/test/resources</directory>
 -            </testResource>
 -        </testResources>
 -    </build>
  </project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/9ab16b97/modules/xbaya-gui/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/9ab16b97/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index f67c495,1890461..381a012
--- a/pom.xml
+++ b/pom.xml
@@@ -469,98 -468,12 +469,99 @@@
                  <module>modules/airavata-client</module>
                  <module>modules/security</module>
                  <module>modules/credential-store</module>
 -                <!--module>modules/rest</module-->
                  <module>modules/orchestrator</module>
                  <module>tools</module>
 +                <module>modules/server</module>
 +                <module>modules/test-suite</module>
 +                <module>modules/distribution</module>
 +                <module>modules/integration-tests</module>
 +                <!--module>modules/rest</module-->
                  <!--module>samples</module-->
 +                <!--module>modules/xbaya-gui</module-->
 +            </modules>
 +        </profile>
 +        <!--profile>
 +            <id>gridTests</id>
 +            <build>
 +                <plugins>
 +                    <plugin>
 +                        <groupId>org.apache.maven.plugins</groupId>
 +                        <artifactId>maven-remote-resources-plugin</artifactId>
 +                        <executions>
 +                            <execution>
 +                                <goals>
 +                                    <goal>process</goal>
 +                                </goals>
 +                            </execution>
 +                        </executions>
 +                    </plugin>
 +                    <plugin>
 +                        <artifactId>maven-resources-plugin</artifactId>
 +                        <version>2.5</version>
 +                        <executions>
 +                            <execution>
 +                                <id>copy-resources</id>
 +                                <phase>validate</phase>
 +                                <goals>
 +                                    <goal>copy-resources</goal>
 +                                </goals>
 +                                <configuration>
 +                                    <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
 +                                    <resources>
 +                                        <resource>
 +                                            <directory>${basedir}/src/main/assembly/dist</directory>
 +                                            <filtering>true</filtering>
 +                                        </resource>
 +                                    </resources>
 +                                </configuration>
 +                            </execution>
 +                        </executions>
 +                    </plugin>
 +                    <plugin>
 +                        <groupId>org.apache.maven.plugins</groupId>
 +                        <artifactId>maven-compiler-plugin</artifactId>
 +                        <version>2.3.2</version>
 +                        <configuration>
 +                            <source>1.6</source>
 +                            <target>1.6</target>
 +                        </configuration>
 +                    </plugin>
 +                    <plugin>
 +                        <groupId>org.apache.maven.plugins</groupId>
 +                        <artifactId>maven-surefire-plugin</artifactId>
 +                        <version>${surefire.version}</version>
 +                        <configuration>
 +                            <failIfNoTests>false</failIfNoTests>
 +                            <skipTests>${skipTests}</skipTests>
 +                            <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
 +                            <excludes>
 +                                <exclude>**/IT.java</exclude>
 +                            </excludes>
 +                            <includes>
 +                                <include>**/*TestWithMyProxyAuth.java</include>
 +                                <include>**/*TestWithSSHAuth.java</include>
 +                            </includes>
 +                        </configuration>
 +                    </plugin>
 +                </plugins>
 +            </build>
 +            <activation>
 +                <activeByDefault>true</activeByDefault>
 +            </activation>
 +            <modules>
 +                <module>airavata-api</module>
 +                <module>modules/gfac</module>
 +                <module>modules/ws-messenger</module>
 +                <module>modules/workflow-model</module>
 +                <module>modules/commons</module>
 +                <module>modules/registry</module>
 +                <module>modules/airavata-client</module>
 +                <module>modules/security</module>
 +                <module>modules/credential-store</module>
 +                <module>modules/orchestrator</module>
 +                <module>tools</module>
                  <module>modules/server</module>
+ 		<module>modules/configuration</module>
                  <module>modules/test-suite</module>
                  <module>modules/distribution</module>
                  <module>modules/integration-tests</module>