incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jus...@apache.org
Subject svn commit: r1060183 - /sling/trunk/launchpad/testing-war/pom.xml
Date Tue, 18 Jan 2011 04:02:33 GMT
Author: justin
Date: Tue Jan 18 04:02:33 2011
New Revision: 1060183

URL: http://svn.apache.org/viewvc?rev=1060183&view=rev
Log:
moving cargo config out of profile so it can be used interactively

Modified:
    sling/trunk/launchpad/testing-war/pom.xml

Modified: sling/trunk/launchpad/testing-war/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/pom.xml?rev=1060183&r1=1060182&r2=1060183&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Tue Jan 18 04:02:33 2011
@@ -249,6 +249,41 @@
                     </systemProperties>
                 </configuration>
             </plugin>
+            
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <configuration>
+                    <wait>${integration.test.wait}</wait>
+                    <container>
+                        <containerId>jetty6x</containerId>
+                        <type>embedded</type>
+                        <systemProperties>
+                            <sling.home>
+                                ${basedir}/target/it/sling
+                            </sling.home>
+                        </systemProperties>
+                    </container>
+                    <configuration>
+                        <home>${project.build.directory}/cargo</home>
+                        <properties>
+                            <cargo.servlet.port>
+                                ${http.port}
+                            </cargo.servlet.port>
+                            <!--
+                                <cargo.jvmargs>-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=30333,server=y,suspend=y</cargo.jvmargs>
+                            -->
+                        </properties>
+                        <deployables>
+                            <deployable>
+                                <properties>
+                                    <context>/${http.base.path}</context>
+                                </properties>
+                            </deployable>
+                        </deployables>
+                    </configuration>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <reporting>
@@ -350,36 +385,6 @@
                                 </goals>
                             </execution>
                         </executions>
-                        <configuration>
-                            <wait>${integration.test.wait}</wait>
-                            <container>
-                                <containerId>jetty6x</containerId>
-                                <type>embedded</type>
-                                <systemProperties>
-                                    <sling.home>
-                                        ${basedir}/target/it/sling
-                                    </sling.home>
-                                </systemProperties>
-                            </container>
-                            <configuration>
-                                <home>${project.build.directory}/cargo</home>
-                                <properties>
-                                    <cargo.servlet.port>
-                                        ${http.port}
-                                    </cargo.servlet.port>
-                                    <!--
-                                        <cargo.jvmargs>-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=30333,server=y,suspend=y</cargo.jvmargs>
-                                    -->
-                                </properties>
-                                <deployables>
-                                    <deployable>
-                                        <properties>
-                                            <context>/${http.base.path}</context>
-                                        </properties>
-                                    </deployable>
-                                </deployables>
-                            </configuration>
-                        </configuration>
                     </plugin>
                 </plugins>
             </build>



Mime
View raw message