wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r813642 - in /incubator/wink/trunk/wink-itests/wink-itest: pom.xml wink-itest-client/pom.xml
Date Fri, 11 Sep 2009 00:41:03 GMT
Author: bluk
Date: Fri Sep 11 00:41:03 2009
New Revision: 813642

URL: http://svn.apache.org/viewvc?rev=813642&view=rev
Log:
Switch to tomcat for default geronimo plugin

Tomcat complains more.  Also, got rid
of unused plugins.

Modified:
    incubator/wink/trunk/wink-itests/wink-itest/pom.xml
    incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/pom.xml

Modified: incubator/wink/trunk/wink-itests/wink-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/pom.xml?rev=813642&r1=813641&r2=813642&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/pom.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/pom.xml Fri Sep 11 00:41:03 2009
@@ -265,7 +265,7 @@
                             </assembly>
                         </assemblies>
 
-                        <defaultAssemblyId>jetty</defaultAssemblyId>
+                        <defaultAssemblyId>tomcat</defaultAssemblyId>
 
                         <optionSets>
                             <optionSet>
@@ -311,37 +311,6 @@
                     </executions>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.codehaus.cargo</groupId>
-                    <artifactId>cargo-maven2-plugin</artifactId>
-                    <version>1.0</version>
-                    <configuration>
-                        <container>
-                            <containerId>jetty6x</containerId>
-                            <type>embedded</type>
-                        </container>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>cargo-start</id>
-                            <goals>
-                                <goal>start</goal>
-                            </goals>
-                            <phase>pre-integration-test</phase>
-                            <configuration>
-                                <wait>false</wait>
-                                <deployables/>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>cargo-stop</id>
-                            <goals>
-                                <goal>stop</goal>
-                            </goals>
-                            <phase>post-integration-test</phase>
-                        </execution>
-                    </executions>
-                </plugin>
                     <plugin>
                         <groupId>org.mortbay.jetty</groupId>
                         <artifactId>maven-jetty-plugin</artifactId>
@@ -384,7 +353,6 @@
                     <name>assemblyId</name>
                     <value>jetty</value>
                 </property>
-                <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
             </properties>
@@ -436,6 +404,7 @@
                     <name>assemblyId</name>
                     <value>tomcat</value>
                 </property>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
             </properties>
@@ -503,24 +472,6 @@
         </profile>
 
         <profile>
-            <id>testsuite-with-cargo-jetty-embedded</id>
-            <activation>
-                <property>
-                    <name>assemblyId</name>
-                    <value>cargo-jetty</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.cargo</groupId>
-                        <artifactId>cargo-maven2-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
             <id>testsuite-with-jetty-standalone</id>
             <activation>
                 <property>

Modified: incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/pom.xml?rev=813642&r1=813641&r2=813642&view=diff
==============================================================================
--- incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/pom.xml (original)
+++ incubator/wink/trunk/wink-itests/wink-itest/wink-itest-client/pom.xml Fri Sep 11 00:41:03
2009
@@ -28,5 +28,5 @@
     <groupId>org.apache.wink</groupId>
     <artifactId>wink-itest-client</artifactId>
     <packaging>war</packaging>
-    <name>Apache Wink Integration Test Client</name>
-</project>
\ No newline at end of file
+    <name>Apache Wink Integration Client Tests</name>
+</project>



Mime
View raw message