svn commit: r1549182 - /karaf/trunk/manual/src/main/webapp/users-guide/webcontainer.conf

[jb...@apache.org]

Author: jbonofre
Date: Sun Dec  8 20:01:32 2013
New Revision: 1549182

URL: http://svn.apache.org/r1549182
Log:
[KARAF-2511] Updating the webcontainer page of the user guide

Modified:
    karaf/trunk/manual/src/main/webapp/users-guide/webcontainer.conf

Modified: karaf/trunk/manual/src/main/webapp/users-guide/webcontainer.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/webcontainer.conf?rev=1549182&r1=1549181&r2=1549182&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/webcontainer.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/webcontainer.conf Sun Dec  8 20:01:32 2013
@@ -150,11 +150,7 @@ A WAB is a standard WAR or JAR archive c
 * {{Bundle-ManifestVersion: 2}} defines that the bundle follows the rules of R4 specification.
 * {{Bundle-SymbolicName}} specifies a unique, non-localizable name for the bundle. This name should be based on the
  reverse domain name convention.
-
-The {{Webapp-Context}} is strongly adviced as well. It defines the Servlet context path. If not specified, the {{Bundle-SymbolicName}}
-will be used.
-
-You can find details about the WAB MANIFEST properties on the [OPS4J Pax Web website|https://ops4j1.jira.com/wiki/display/ops4j/Pax+Web+Extender+-+War+-+OSGi-fy].
+* {{Web-ContextPath}} specifies the location of the web application.
 
 WAB can be deployed directly in Apache Karaf, for instance, by dropping the archive in the {{deploy}} folder, or using the
 {{bundle:install}} command.
@@ -174,10 +170,10 @@ Using the {{webbundle}} prefix and provi
 For instance, you can deploy the Apache Tomcat sample non-OSGi "classical" WAR with the following command:
 
 {code}
-karaf@root()> bundle:install -s "webbundle:http://tomcat.apache.org/tomcat-7.0-doc/appdev/sample/sample.war?Bundle-SymbolicName=tomcat-sample&Webapp-Context=/sample"
+karaf@root()> bundle:install -s "webbundle:http://tomcat.apache.org/tomcat-7.0-doc/appdev/sample/sample.war?Bundle-SymbolicName=tomcat-sample&Web-ContextPath=/sample"
 {code}
 
-You can note the {{webbundle}} prefix, and the {{Bundle-SymbolicName}} and {{Webapp-Context}} headers on the URL.
+You can note the {{webbundle}} prefix, and the {{Bundle-SymbolicName}} and {{Web-ContextPath}} headers on the URL.
 
 h2. Commands