You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/06/03 19:20:45 UTC
svn commit: r1345716 - in /karaf/cave/trunk: manual/pom.xml
manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
manual/src/main/webapp/user-guide/installation.conf pom.xml
Author: jbonofre
Date: Sun Jun 3 17:20:44 2012
New Revision: 1345716
URL: http://svn.apache.org/viewvc?rev=1345716&view=rev
Log:
[KARAF-1516] Fix Cave manual build and update feature name
Modified:
karaf/cave/trunk/manual/pom.xml
karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
karaf/cave/trunk/manual/src/main/webapp/user-guide/installation.conf
karaf/cave/trunk/pom.xml
Modified: karaf/cave/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cave/trunk/manual/pom.xml?rev=1345716&r1=1345715&r2=1345716&view=diff
==============================================================================
--- karaf/cave/trunk/manual/pom.xml (original)
+++ karaf/cave/trunk/manual/pom.xml Sun Jun 3 17:20:44 2012
@@ -37,7 +37,7 @@
<manual.dir>${project.build.directory}/manual</manual.dir>
<manual>${manual.dir}/cave-manual-${project.version}</manual>
<scala.version>2.8.1</scala.version>
- <scalata.version>1.3.2</scalata.version>
+ <scalate.version>1.3.2</scalate.version>
<cave.version>${project.version}</cave.version>
</properties>
@@ -236,4 +236,4 @@
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
URL: http://svn.apache.org/viewvc/karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml?rev=1345716&r1=1345715&r2=1345716&view=diff
==============================================================================
--- karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml (original)
+++ karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml Sun Jun 3 17:20:44 2012
@@ -17,7 +17,7 @@
-#
-@ var body: String
--@ var title : String = "Apache Karaf Cellar ${cellar.version} Guide"
+-@ var title : String = "Apache Karaf Cave ${cave.version} Guide"
- response.setContentType("text/html")
-# Only include the console if it's available and the engine is in dev mode.
Modified: karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
URL: http://svn.apache.org/viewvc/karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp?rev=1345716&r1=1345715&r2=1345716&view=diff
==============================================================================
--- karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp (original)
+++ karaf/cave/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp Sun Jun 3 17:20:44 2012
@@ -16,7 +16,7 @@ See the License for the specific languag
limitations under the License.
--%>
<%@ var body: String %>
-<%@ var title: String = "Apache Karaf Cellar ${cellar.version}" %>
+<%@ var title: String = "Apache Karaf Cave ${cave.version}" %>
<% escapeMarkup = false %>
<!DOCTYPE html>
<html>
@@ -807,8 +807,8 @@ div.compare div div {
</head>
<body>
<div id="titlepage">
- <div id="title">Apache Karaf Cellar</div>
- <div id="subtitle">Version ${cellar.version}</div>
+ <div id="title">Apache Karaf Cave</div>
+ <div id="subtitle">Version ${cave.version}</div>
</div>
<div id="main">
<%= body %>
Modified: karaf/cave/trunk/manual/src/main/webapp/user-guide/installation.conf
URL: http://svn.apache.org/viewvc/karaf/cave/trunk/manual/src/main/webapp/user-guide/installation.conf?rev=1345716&r1=1345715&r2=1345716&view=diff
==============================================================================
--- karaf/cave/trunk/manual/src/main/webapp/user-guide/installation.conf (original)
+++ karaf/cave/trunk/manual/src/main/webapp/user-guide/installation.conf Sun Jun 3 17:20:44 2012
@@ -26,32 +26,21 @@ karaf@root> features:list|grep -i cave
[uninstalled] [3.0.0-SNAPSHOT ] cave-server repo-0
{code}
-h3. Starting Cave Server
+h3. Starting Cave OBR Server
To start Cave, you have to install the cave-server feature:
{code}
-karaf@root> features:install cave-server
+karaf@root> features:install cave-obr-server
{code}
-NB: installation of the cave-server feature will install others features, such as obr, http, war, cxf. It could take
+NB: installation of the cave-obr-server feature will install others features, such as obr, http, war, cxf. It could take
several minutes depending of your network connection speed.
-You can see the Cave bundles installed:
-
-{code}
-karaf@root> la|grep -i cave
-[ 134] [Active ] [ ] [ ] [ 60] Apache Karaf :: Cave :: Server :: API (3.0.0.SNAPSHOT)
-[ 135] [Active ] [Created ] [ ] [ 60] Apache Karaf :: Cave :: Server :: Storage (3.0.0.SNAPSHOT)
-[ 136] [Active ] [Created ] [ ] [ 60] Apache Karaf :: Cave :: Server :: Management (3.0.0.SNAPSHOT)
-[ 137] [Active ] [Created ] [ ] [ 60] Apache Karaf :: Cave :: Server :: Command (3.0.0.SNAPSHOT)
-[ 138] [Active ] [ ] [ ] [ 60] Apache Karaf :: Cave :: Server :: HTTP (3.0.0.SNAPSHOT)
-{code}
-
The Cave commands are now available:
{code}
karaf@root> cave:<TAB>
cave:create-repository cave:destroy-repository cave:list-repositories cave:populate-repository
cave:proxy-repository cave:register-repository cave:scan-repository cave:upload-artifact
-{code}
\ No newline at end of file
+{code}
Modified: karaf/cave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cave/trunk/pom.xml?rev=1345716&r1=1345715&r2=1345716&view=diff
==============================================================================
--- karaf/cave/trunk/pom.xml (original)
+++ karaf/cave/trunk/pom.xml Sun Jun 3 17:20:44 2012
@@ -89,13 +89,17 @@
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>