incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r762239 - /incubator/sling/trunk/launchpad/webapp/pom.xml
Date Mon, 06 Apr 2009 07:47:37 GMT
Author: fmeschbe
Date: Mon Apr  6 07:47:36 2009
New Revision: 762239

URL: http://svn.apache.org/viewvc?rev=762239&view=rev
Log:
SLING-845 Inject sling.home as a context init-param (requires Jetty Plugin 6.1.6
   or higher)

Modified:
    incubator/sling/trunk/launchpad/webapp/pom.xml

Modified: incubator/sling/trunk/launchpad/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/pom.xml?rev=762239&r1=762238&r2=762239&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/webapp/pom.xml Mon Apr  6 07:47:36 2009
@@ -67,6 +67,11 @@
             Sling home directory when starting with jetty:run
         -->
         <jetty.sling.home>target/sling</jetty.sling.home>
+        
+        <!--
+            Context path of the Sling web application
+        -->
+        <jetty.sling.context>/</jetty.sling.context>
 
     </properties>
 
@@ -97,13 +102,6 @@
                         ${jetty.scan.interval.seconds}
                     </scanIntervalSeconds>
 
-                    <systemProperties>
-                        <systemProperty>
-                            <name>sling.home</name>
-                            <value>${jetty.sling.home}</value>
-                        </systemProperty>
-                    </systemProperties>
-
                     <connectors>
                         <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
                             <port>${http.port}</port>
@@ -118,6 +116,12 @@
                     <webAppSourceDirectory>
                         target/${artifactId}-${pom.version}
                     </webAppSourceDirectory>
+                    <webAppConfig>
+                        <contextPath>${jetty.sling.context}</contextPath>
+                        <initParams>
+                            <sling.home>${jetty.sling.home}</sling.home>
+                        </initParams>
+                    </webAppConfig>
                 </configuration>
             </plugin>
 



Mime
View raw message