geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1021889 - in /geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war: pom.xml src/main/filtered-resources/ src/main/webapp/WEB-INF/geronimo-web.xml
Date Tue, 12 Oct 2010 19:19:45 GMT
Author: gawor
Date: Tue Oct 12 19:19:45 2010
New Revision: 1021889

URL: http://svn.apache.org/viewvc?rev=1021889&view=rev
Log:
fix servlet30 tests... src/main/webapp is already filtered

Added:
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r1021886, geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/filtered-resources/WEB-INF/geronimo-web.xml
Removed:
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/filtered-resources/
Modified:
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml?rev=1021889&r1=1021888&r2=1021889&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/pom.xml
Tue Oct 12 19:19:45 2010
@@ -97,16 +97,16 @@
                                     <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                                 </configuration>
                             </execution>
-                            <!--<execution>-->
-                                <!--<id>undeploy-war-as-moduleId</id>-->
-                                <!--<phase>post-integration-test</phase>-->
-                                <!--<goals>-->
-                                    <!--<goal>undeploy-module</goal>-->
-                                <!--</goals>-->
-                                <!--<configuration>-->
-                                    <!--<moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>-->
-                                <!--</configuration>-->
-                            <!--</execution>-->
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
+                                </configuration>
+                            </execution>
                         </executions>
                     </plugin>
                     <plugin>

Copied: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
(from r1021886, geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/filtered-resources/WEB-INF/geronimo-web.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/geronimo-web.xml?p2=geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/geronimo-web.xml&p1=geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/filtered-resources/WEB-INF/geronimo-web.xml&r1=1021886&r2=1021889&rev=1021889&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/filtered-resources/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
Tue Oct 12 19:19:45 2010
@@ -27,7 +27,7 @@
       <sys:groupId>${project.groupId}</sys:groupId>
       <sys:artifactId>${project.artifactId}</sys:artifactId>
       <sys:version>${project.version}</sys:version>
-      <sys:type>car</sys:type>
+      <sys:type>war</sys:type>
     </sys:moduleId>
     <sys:dependencies/>
     <sys:hidden-classes/>



Mime
View raw message