svn commit: r1421627 - in /airavata/trunk: modules/integration-tests/pom.xml pom.xml

[la...@apache.org]

Author: lahiru
Date: Fri Dec 14 00:28:59 2012
New Revision: 1421627

URL: http://svn.apache.org/viewvc?rev=1421627&view=rev
Log:
Fixing issue AIRAVATA-674. Thanks Amila.

Modified:
    airavata/trunk/modules/integration-tests/pom.xml
    airavata/trunk/pom.xml

Modified: airavata/trunk/modules/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/pom.xml?rev=1421627&r1=1421626&r2=1421627&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Fri Dec 14 00:28:59 2012
@@ -18,8 +18,8 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>tomcat-distribution</artifactId>
-    <name>tomcat-distribution</name>
+    <artifactId>integration-tests</artifactId>
+    <name>Airavata Integration Tests</name>
     <url>http://airavata.apache.org/</url>
     
     <build>
@@ -109,6 +109,12 @@
                         <phase>compile</phase>
                         <configuration>
                             <target>
+                                <copy todir="${tomcat.work.dir}/lib">
+                                    <fileset dir="${airavata.work.dir}/lib/">
+                                        <exclude name="tomcat-*.jar"/>
+                                        <exclude name="icu4j-*.jar"/>
+                                    </fileset>
+                                </copy>
                                 <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF">
                                     <fileset dir="${airavata.work.dir}/repository/"/>
                                 </copy>
@@ -370,6 +376,18 @@
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-jpa-registry</artifactId>
+            <type>jar</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>

Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1421627&r1=1421626&r2=1421627&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Fri Dec 14 00:28:59 2012
@@ -427,7 +427,7 @@
 		<module>modules/server</module>
                 <module>modules/distribution</module>
                 <module>modules/test-suite</module>
-                <!--module>modules/integration-tests</module-->
+                <module>modules/integration-tests</module>
             </modules>
         </profile>
     </profiles>