geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r447401 [3/3] - in /geronimo/server/branches/sachin: ./ applications/console/geronimo-console-framework/src/main/webapp/js/ applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/server/ applicat...
Date Mon, 18 Sep 2006 13:41:09 GMT
Modified: geronimo/server/branches/sachin/testsuite/deployment-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsuite/deployment-testsuite/pom.xml?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/branches/sachin/testsuite/deployment-testsuite/pom.xml Mon Sep 18 06:41:03
2006
@@ -94,14 +94,10 @@
                                 </goals>
                                 <configuration>
                                     <background>true</background>
-                                    <!--
-                                    HACK: For now need to refresh the install since we
-                                          do not have an easy way to automate undeploy.
-                                    -->
-                                    <refresh>true</refresh>
                                 </configuration>
                             </execution>
-                            
+
+
                             <execution>
                                 <id>deploy-ears</id>
                                 <phase>pre-integration-test</phase>
@@ -127,9 +123,34 @@
                                 </configuration>
                             </execution>
                             
-                            <!--
-                            TODO: Undeploy
-                            -->
+                            <execution>
+                                <id>undeploy-ear-as-module</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                  <modules>
+                                        <module>
+                                            <groupId>org.apache.geronimo.testsupport</groupId>
+                                            <artifactId>test-ear-j2ee_1.3</artifactId>
+                                            <version>${pom.version}</version>
+                                            <type>ear</type>
+                                        </module>
+                                  </modules>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>undeploy-ear-as-moduleId</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${pom.version}/ear</moduleId>
+                                </configuration>
+                            </execution>
                             
                             <execution>
                                 <id>stop-server</id>

Modified: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
(original)
+++ geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
Mon Sep 18 06:41:03 2006
@@ -65,6 +65,13 @@
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <artifactId>maven-ear-plugin</artifactId>

Modified: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml?view=diff&rev=447401&r1=447400&r2=447401
==============================================================================
--- geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
(original)
+++ geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
Mon Sep 18 06:41:03 2006
@@ -65,6 +65,13 @@
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <artifactId>maven-ear-plugin</artifactId>
@@ -95,6 +102,7 @@
                 </configuration>
             </plugin>
         </plugins>
+
     </build>
     
 </project>



Mime
View raw message