incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jus...@apache.org
Subject svn commit: r1059737 - /sling/trunk/launchpad/testing-war/pom.xml
Date Mon, 17 Jan 2011 03:11:02 GMT
Author: justin
Date: Mon Jan 17 03:11:01 2011
New Revision: 1059737

URL: http://svn.apache.org/viewvc?rev=1059737&view=rev
Log:
using root context path by default for testing-war

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=1059737&r1=1059736&r2=1059737&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/pom.xml (original)
+++ sling/trunk/launchpad/testing-war/pom.xml Mon Jan 17 03:11:01 2011
@@ -146,7 +146,7 @@
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
                 <configuration>
-                    <contextPath>/</contextPath>
+                    <contextPath>/${http.base.path}</contextPath>
                     <scanIntervalSeconds>
                         ${jetty.scan.interval.seconds}
                     </scanIntervalSeconds>
@@ -314,7 +314,7 @@
                                                 launchpad.http.server.url
                                             </name>
                                             <value>
-                                                http://${test.host}:${http.port}/${project.build.finalName}
+                                                http://${test.host}:${http.port}/${http.base.path}
                                             </value>
                                         </property>
                                         <property>
@@ -322,7 +322,7 @@
                                                 launchpad.webdav.server.url
                                             </name>
                                             <value>
-                                                http://${test.host}:${http.port}/${project.build.finalName}/${webdav.workspace.path}
+                                                http://${test.host}:${http.port}/${webdav.workspace.path}
                                             </value>
                                         </property>
 
@@ -371,6 +371,13 @@
                                         <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>



Mime
View raw message