airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [08/11] airavata git commit: adding pom
Date Fri, 27 Jan 2017 20:41:24 GMT
adding pom


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

Branch: refs/heads/develop
Commit: 4d43fc48aef971c5122940f30332d1cf30bc135e
Parents: c072479
Author: Ajinkya Dhamnaskar <adhamnas@umail.iu.edu>
Authored: Sun Dec 18 13:51:28 2016 -0500
Committer: Ajinkya Dhamnaskar <adhamnas@umail.iu.edu>
Committed: Sun Dec 18 13:51:28 2016 -0500

----------------------------------------------------------------------
 .../test-suite/multi-tenanted-airavata/pom.xml  | 177 ++++++++++++++-----
 modules/test-suite/pom.xml                      |   2 +-
 2 files changed, 133 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/4d43fc48/modules/test-suite/multi-tenanted-airavata/pom.xml
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/pom.xml b/modules/test-suite/multi-tenanted-airavata/pom.xml
index cbc8d4e..25957fd 100644
--- a/modules/test-suite/multi-tenanted-airavata/pom.xml
+++ b/modules/test-suite/multi-tenanted-airavata/pom.xml
@@ -24,26 +24,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-client-configuration</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-api-stubs</artifactId>
             <version>${project.version}</version>
@@ -78,57 +58,164 @@
             <artifactId>gson</artifactId>
             <version>2.3.1</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>mysql</groupId>-->
-            <!--<artifactId>mysql-connector-java</artifactId>-->
-            <!--<version>5.1.35</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>multi-tenanted-airavata</artifactId>
+            <version>0.17-SNAPSHOT</version>
+        </dependency>
+        <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>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derbynet</artifactId>
             <version>${derby.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derbytools</artifactId>
             <version>${derby.version}</version>
-            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.1.1</version>
         </dependency>
     </dependencies>
     <build>
+
         <plugins>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.airavata.testsuite.multitenantedairavata.FrameworkBootstrapping</mainClass>
-                        </manifest>
-                        <manifestEntries>
-                            <Class-Path>./resources/</Class-Path>
-                        </manifestEntries>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
+                    <!--<execution>-->
+                        <!--<id>start-airavata-server</id>-->
+                        <!--<phase>pre-integration-test</phase>-->
+                        <!--<configuration>-->
+                            <!--<target>-->
+                                <!--<exec executable="./startup-airavata.sh" dir="${project.basedir}/src/main/resources/"
spawn="true">-->
+
+                                <!--</exec>-->
+
+                            <!--</target>-->
+                        <!--</configuration>-->
+                        <!--<goals>-->
+                            <!--<goal>run</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                    <execution>
+                        <phase>generate-test-resources</phase>
+                        <configuration>
+
+                            <tasks>
+                                <mkdir dir="${project.build.directory}/test-classes/base-airavata/"/>
+                                <mkdir dir="${project.build.directory}/test-classes/local-exp-resources/scratch"/>
+                                <mkdir dir="${project.build.directory}/test-classes/local-exp-resources/storage"/>
+                                <mkdir dir="${project.build.directory}/test-classes/local-exp-resources/wrapper"/>
+                                <mkdir dir="${project.build.directory}/test-classes/local-exp-resources/bin"/>
+
+                            </tasks>
+
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
                     <execution>
-                        <id>make-assembly</id> <!-- this is used for inheritance
merges -->
-                        <phase>package</phase> <!-- bind to the packaging
phase -->
+                        <id>process-test-classes</id>
+                        <phase>process-test-classes</phase>
+                        <configuration>
+                            <target>
+
+                                <chmod file="${project.build.directory}/test-classes/airavata-server-stop.sh"
perm="755"/>
+                                <chmod file="${project.build.directory}/test-classes/startup-airavata.sh"
perm="755"/>
+                                <chmod file="${project.build.directory}/test-classes/local-exp-resources/wrapper/echo_wrapper.sh"
perm="755"/>
+
+                            </target>
+                        </configuration>
                         <goals>
-                            <goal>single</goal>
+                            <goal>run</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-failsafe-plugin</artifactId>-->
+                <!--<version>2.5</version>-->
+                <!--<configuration>-->
+                    <!--<failIfNoTests>false</failIfNoTests>-->
+
+                    <!--&lt;!&ndash;excludes>-->
+                        <!--<exclude>**/*IT.java</exclude>-->
+                    <!--</excludes &ndash;&gt;-->
+                    <!--<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>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surefire.version}</version>
+                <inherited>true</inherited>
+                <configuration>
+                    <test>org.apache.airavata.testsuite.multitenantedairavata.AiravataIT</test>
+                </configuration>
+            </plugin>
+
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-failsafe-plugin</artifactId>-->
+                <!--<configuration>-->
+                    <!--&lt;!&ndash;<test>&ndash;&gt;-->
+                        <!--&lt;!&ndash;org.apache.airavata.testsuite.multitenantedairavata.AiravataIntegrationTestSuit&ndash;&gt;-->
+                    <!--&lt;!&ndash;</test>&ndash;&gt;-->
+                    <!--<includes>-->
+                        <!--<include>**/*AiravataIntegrationTestSuit.java</include>-->
+                    <!--</includes>-->
+                <!--</configuration>-->
+
+                <!--&lt;!&ndash;<executions>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<execution>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<goals>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<goal>integration-test</goal>&ndash;&gt;-->
+                            <!--&lt;!&ndash;<goal>verify</goal>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</goals>&ndash;&gt;-->
+                    <!--&lt;!&ndash;</execution>&ndash;&gt;-->
+                <!--&lt;!&ndash;</executions>&ndash;&gt;-->
+            <!--</plugin>-->
+
         </plugins>
+        <testSourceDirectory>${project.basedir}/src/main/java</testSourceDirectory>
+        <testResources>
+            <testResource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </testResource>
+        </testResources>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/4d43fc48/modules/test-suite/pom.xml
----------------------------------------------------------------------
diff --git a/modules/test-suite/pom.xml b/modules/test-suite/pom.xml
index a89b30d..9da1d8b 100644
--- a/modules/test-suite/pom.xml
+++ b/modules/test-suite/pom.xml
@@ -36,4 +36,4 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
-</project>
+</project>
\ No newline at end of file


Mime
View raw message