You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/02/10 13:43:27 UTC
svn commit: r1069367 - in /karaf/trunk/manual: pom.xml
src/main/webapp/_navigation.conf
src/main/webapp/users-guide/installing-features.conf
src/main/webapp/users-guide/web-applications.conf
Author: gnodet
Date: Thu Feb 10 12:43:27 2011
New Revision: 1069367
URL: http://svn.apache.org/viewvc?rev=1069367&view=rev
Log:
A few more changes to the manual
Added:
karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf
- copied, changed from r1069333, karaf/trunk/manual/src/main/webapp/users-guide/installing-features.conf
Removed:
karaf/trunk/manual/src/main/webapp/users-guide/installing-features.conf
Modified:
karaf/trunk/manual/pom.xml
karaf/trunk/manual/src/main/webapp/_navigation.conf
Modified: karaf/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/pom.xml?rev=1069367&r1=1069366&r2=1069367&view=diff
==============================================================================
--- karaf/trunk/manual/pom.xml (original)
+++ karaf/trunk/manual/pom.xml Thu Feb 10 12:43:27 2011
@@ -41,7 +41,7 @@
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
<jetty-port>8080</jetty-port>
<jetty-war-dir>${project.build.directory}/webapp/</jetty-war-dir>
- <scalate.version>1.4.0-SNAPSHOT</scalate.version>
+ <scalate.version>1.4.0</scalate.version>
<wikitext.version>1.3-SNAPSHOT</wikitext.version>
<scalate.editor>${env.SCALATE_EDITOR}</scalate.editor>
<scalate.mode>production</scalate.mode>
@@ -94,6 +94,16 @@
<artifactId>slf4j-api</artifactId>
<version>1.6.0</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ <version>2.8.1</version>
+ </dependency>
</dependencies>
<build>
Modified: karaf/trunk/manual/src/main/webapp/_navigation.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/_navigation.conf?rev=1069367&r1=1069366&r2=1069367&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/_navigation.conf (original)
+++ karaf/trunk/manual/src/main/webapp/_navigation.conf Thu Feb 10 12:43:27 2011
@@ -16,10 +16,11 @@ h3. [Users Guide|/users-guide/index]
- [Failover Deployments|/users-guide/failover]
- [Logging system|/users-guide/logging-system]
-- [Installing additional features|/users-guide/installing-features]
- [Deployer|/users-guide/deployer]
- [Provisioning|/users-guide/provisioning]
- [Configuration|/users-guide/configuration]
+- [Web applications|/users-guide/web-applications]
+- [OS integration|/users-guide/wrapper]
h3. [Developers Guide|/developers-guide/index]
Copied: karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf (from r1069333, karaf/trunk/manual/src/main/webapp/users-guide/installing-features.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf?p2=karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf&p1=karaf/trunk/manual/src/main/webapp/users-guide/installing-features.conf&r1=1069333&r2=1069367&rev=1069367&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/installing-features.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf Thu Feb 10 12:43:27 2011
@@ -1,35 +1,7 @@
+h1. Web applications
-{warning:title=Outdated documentation}
-
-h1. Installing additional features
-
-This chapter will demonstrate how to add additional features from a remote maven repository to a default installation of Karaf.
-
-{info}Last updated September 3, 2010 using Karaf 2.0.0{info}
-
-h2. Adding additional feature repositories
-
-The following steps will add in the URLs for the Camel & ActiveMQ features locations.
-# Start Karaf
-{noformat}
-cd bin
-./karaf or karaf.bat
-{noformat}
-# Add the following feature install locations
-{noformat}
-karaf@root> features:addUrl mvn:org.apache.activemq/activemq-karaf/5.4.0/xml/features
-karaf@root> features:addUrl mvn:org.apache.camel.karaf/features/2.0.0/xml/features
-{noformat}
-# Verify the feature URLs were added -
-{noformat}
-karaf@root> features:listUrl
-mvn:org.apache.camel.karaf/features/2.0.0/xml/features valid
-mvn:org.apache.activemq/activemq-karaf/5.4.0/xml/features valid
-mvn:org.apache.karaf/apache-karaf/2.0.1-SNAPSHOT/xml/features valid
-{noformat}
-
-h2. Installing a new feature (war)
+h2. Installing war support
The following steps will install the "war" feature (support for deploying WAR files with Servlet and JSPs into a Jetty server) into your Karaf instance.
# List the available features -
@@ -37,12 +9,12 @@ The following steps will install the "wa
karaf@root> features:list
State Name
. . .
-[uninstalled] [2.0.0] obr karaf-2.0.0
-[uninstalled] [2.0.0] config karaf-2.0.0
-[uninstalled] [2.0.0] http karaf-2.0.0
-[uninstalled] [2.0.0] war karaf-2.0.0
-[uninstalled] [2.0.0] webconsole karaf-2.0.0
-[installed ] [2.0.0] ssh karaf-2.0.0
+[uninstalled] [2.2.0] obr karaf-2.2.0
+[uninstalled] [2.2.0] config karaf-2.2.0
+[uninstalled] [2.2.0] http karaf-2.2.0
+[uninstalled] [2.2.0] war karaf-2.2.0
+[uninstalled] [2.2.0] webconsole karaf-2.2.0
+[installed ] [2.2.0] ssh karaf-2.2.0
. . .
{noformat}
# Install the war feature (and the sub-features it requires) -
@@ -81,8 +53,8 @@ Installing bundle mvn:org.ops4j.pax.url/
servicemix> features/list
State Name
. . .
-[installed ] [2.0.0] http karaf-2.0.0
-[installed ] [2.0.0] war karaf-2.0.0
+[installed ] [2.2.0] http karaf-2.2.0
+[installed ] [2.2.0] war karaf-2.2.0
. . .
{noformat}
# Verify the installed bundles were started
@@ -93,15 +65,15 @@ START LEVEL 100
. . .
[ 32] [Active ] [ ] [ 60] geronimo-servlet_2.5_spec (1.1.2)
[ 33] [Active ] [ ] [ 60] Apache ServiceMix :: Bundles :: jetty (6.1.22.2)
-[ 34] [Active ] [ ] [ 60] OPS4J Pax Web - API (0.7.2)
-[ 35] [Active ] [ ] [ 60] OPS4J Pax Web - Service SPI (0.7.2)
-[ 36] [Active ] [ ] [ 60] OPS4J Pax Web - Runtime (0.7.2)
-[ 37] [Active ] [ ] [ 60] OPS4J Pax Web - Jetty (0.7.2)
-[ 38] [Active ] [ ] [ 60] OPS4J Pax Web - Jsp Support (0.7.2)
-[ 39] [Active ] [ ] [ 60] OPS4J Pax Web - Extender - WAR (0.7.2)
-[ 40] [Active ] [ ] [ 60] OPS4J Pax Web - Extender - Whiteboard (0.7.2)
-[ 41] [Active ] [ ] [ 60] OPS4J Pax Url - war:, war-i: (1.1.3)
-[ 42] [Active ] [Created ] [ 60] Apache Karaf :: WAR Deployer (2.0.0)
+[ 34] [Active ] [ ] [ 60] OPS4J Pax Web - API (1.0.0)
+[ 35] [Active ] [ ] [ 60] OPS4J Pax Web - Service SPI (1.0.0)
+[ 36] [Active ] [ ] [ 60] OPS4J Pax Web - Runtime (1.0.0)
+[ 37] [Active ] [ ] [ 60] OPS4J Pax Web - Jetty (1.0.0)
+[ 38] [Active ] [ ] [ 60] OPS4J Pax Web - Jsp Support (1.0.0)
+[ 39] [Active ] [ ] [ 60] OPS4J Pax Web - Extender - WAR (1.0.0)
+[ 40] [Active ] [ ] [ 60] OPS4J Pax Web - Extender - Whiteboard (1.0.0)
+[ 42] [Active ] [ ] [ 60] OPS4J Pax Web - FileInstall Deployer (1.0.0)
+[ 41] [Active ] [ ] [ 60] OPS4J Pax Url - war:, war-i: (1.2.4)
. . .
{noformat}
# The Jetty server should now be listening on http://localhost:8181/, but with no published applications available.
@@ -119,4 +91,9 @@ The following steps will describe how to
[http://wiki.ops4j.org/confluence/display/ops4j/Pax+Web+Extender+-+War+-+OSGi-fy]
# Copy the updated WAR (archive or extracted files) to the _deploy_ directory.
+If you want to deploy a sample web application into Karaf, you could use the following command:
+{code}
+karaf@root> osgi:install -s webbundle:http://tomcat.apache.org/tomcat-5.5-doc/appdev/sample/sample.war?Bundle-SymbolicName=tomcat-sample&Webapp-Context=/sample
+{code}
+Then open your web browser and point to {{http://localhost:8181/sample/index.html}}.