Author: samindaw
Date: Thu Aug 1 09:30:59 2013
New Revision: 1509149
URL: http://svn.apache.org/r1509149
Log:
updating integration test pom to use m2 repo hosted tomcat 7.0.35 version
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=1509149&r1=1509148&r2=1509149&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Thu Aug 1 09:30:59 2013
@@ -23,6 +23,31 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <id>unpack-artifacts</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.apache.tomcat</groupId>
+
<artifactId>tomcat</artifactId>
+
<version>${tomcat.version}</version>
+
<type>zip</type>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/tests</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -33,25 +58,8 @@
<configuration>
<target>
<taskdef
resource="net/sf/antcontrib/antlib.xml"
classpathref="maven.dependency.classpath" />
- <if>
- <available
file="${local.tomcat.distribution}" />
- <then>
- <echo message="Using Tomcat
distribution in local repository ..." />
- <copy
file="${local.tomcat.distribution}" todir="${project.build.directory}"
overwrite="true" />
- </then>
- <else>
- <echo message="Downloading Tomcat
distribution ..." />
- <get dest="${project.build.directory}">
- <url
url="http://archive.apache.org/dist/tomcat/tomcat-${major.tomcat.version}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip";
/>
- </get>
-
- </else>
- </if>
-
-
<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/META-INF">
<fileset
dir="../distribution/airavata-server/target/axis2-${axis2.version}/META-INF" />
</copy>
@@ -91,34 +99,6 @@
</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>
@@ -154,14 +134,6 @@
<replacetoken>8080</replacetoken>
<replacevalue>${test.running.port}</replacevalue>
</replace>
- <!--replace
file="${tomcat.work.dir}/webapps/airavata-registry/WEB-INF/classes/airavata-server.properties">
- <replacetoken>8080</replacetoken>
-
<replacevalue>${test.running.port}</replacevalue>
- </replace>
- <replace
file="${tomcat.work.dir}/webapps/axis2/WEB-INF/classes/airavata-server.properties">
- <replacetoken>8080</replacetoken>
-
<replacevalue>${test.running.port}</replacevalue>
- </replace-->
</target>
</configuration>
<goals>
Modified: airavata/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1509149&r1=1509148&r2=1509149&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Thu Aug 1 09:30:59 2013
@@ -77,7 +77,7 @@
<xmlbeans.version>2.5.0</xmlbeans.version>
<xpp3.version>1.1.3_7</xpp3.version>
<jersey.version>1.13</jersey.version>
- <tomcat.version>7.0.33</tomcat.version>
+ <tomcat.version>7.0.35</tomcat.version>
<cargo.version>1.3.1</cargo.version>
<oa4mp.version>1.0.6</oa4mp.version>
<antrun.version>1.6</antrun.version>
