You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:53:35 UTC

[sling-org-apache-sling-launchpad-testing-war] 06/16: moving cargo config out of profile so it can be used interactively

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.launchpad.testing-war-6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-testing-war.git

commit 1f78dad9853de882d6fd1533c19d9fef87b843b3
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Tue Jan 18 04:02:33 2011 +0000

    moving cargo config out of profile so it can be used interactively
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/testing-war@1060183 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 65 +++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index 281ebcc..6175531 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.