You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2013/01/11 21:44:23 UTC

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

Author: lahiru
Date: Fri Jan 11 20:44:23 2013
New Revision: 1432281

URL: http://svn.apache.org/viewvc?rev=1432281&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-718.

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

Modified: airavata/trunk/modules/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/pom.xml?rev=1432281&r1=1432280&r2=1432281&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Fri Jan 11 20:44:23 2013
@@ -54,6 +54,11 @@
                                 <unzip src="../distribution/airavata-server/target/apache-airavata-server-${project.version}-bin.zip" dest="${project.build.directory}/tests"/>
                                 <unzip src="../distribution/xbaya-gui/target/apache-airavata-xbaya-gui-${project.version}-bin.zip" dest="${project.build.directory}/tests"/>
                                 <unzip src="${project.build.directory}/apache-tomcat-${tomcat.version}.zip" dest="${project.build.directory}/tests"/>
+                                <copy todir="${tomcat.work.dir}/webapps/axis2">
+                                    <fileset dir="../distribution/airavata-server/target/axis2-${axis2.version}/META-INF"/>
+                                    <fileset dir="../distribution/airavata-server/target/axis2-${axis2.version}/WEB-INF"/>
+                                    <fileset dir="../distribution/airavata-server/target/axis2-${axis2.version}/axis2-web"/>
+                                </copy>
                                 <delete dir="${tomcat.work.dir}/webapps/examples"/>
                             </target>
                         </configuration>
@@ -83,33 +88,34 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.4</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>unpack-axis2</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.axis2</groupId>
-                                    <artifactId>axis2-webapp</artifactId>
-                                    <version>${axis2.version}</version>
-                                    <type>war</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${tomcat.work.dir}/webapps/axis2</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-dependency-plugin</artifactId>-->
+                <!--<version>2.4</version>-->
+                <!--<inherited>false</inherited>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>unpack-axis2</id>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>unpack</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<artifactItems>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.axis2</groupId>-->
+                                    <!--<artifactId>axis2-webapp</artifactId>-->
+                                    <!--<version>${axis2.version}</version>-->
+                                    <!--<type>war</type>-->
+                                    <!--<overWrite>true</overWrite>-->
+                                    <!--<outputDirectory>${tomcat.work.dir}/webapps/axis2</outputDirectory>-->
+                                <!--</artifactItem>-->
+                                <!--<excludes>**/icu4j-2.6.1.jar</excludes>-->
+                            <!--</artifactItems>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>