[KARAF-1516] Fix Cave manual build and update feature name git-svn-id: https://svn.apache.org/repos/asf/karaf/cave/trunk@1345716 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/51a6137b Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/51a6137b Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/51a6137b Branch: refs/heads/master Commit: 51a6137b6bd59de0fb0ca06c4cc4b0f587e58233 Parents: 1d19c68 Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Sun Jun 3 17:20:44 2012 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Sun Jun 3 17:20:44 2012 +0000 ---------------------------------------------------------------------- manual/pom.xml | 4 ++-- .../webapp/WEB-INF/scalate/layouts/default.scaml | 2 +- .../webapp/WEB-INF/scalate/layouts/print.ssp | 6 +++--- .../src/main/webapp/user-guide/installation.conf | 19 ++++--------------- pom.xml | 6 +++++- 5 files changed, 15 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/51a6137b/manual/pom.xml ---------------------------------------------------------------------- diff --git a/manual/pom.xml b/manual/pom.xml index 8df21e0..f0884d7 100644 --- a/manual/pom.xml +++ b/manual/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/51a6137b/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml b/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml index 3b2080b..bdebb26 100644 --- a/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml +++ b/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml @@ -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. http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/51a6137b/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp b/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp index 29272a8..b14ae8c 100644 --- a/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp +++ b/manual/src/main/webapp/WEB-INF/scalate/layouts/print.ssp @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and 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 %> http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/51a6137b/manual/src/main/webapp/user-guide/installation.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/user-guide/installation.conf b/manual/src/main/webapp/user-guide/installation.conf index c7dbe3e..18dd32b 100644 --- a/manual/src/main/webapp/user-guide/installation.conf +++ b/manual/src/main/webapp/user-guide/installation.conf @@ -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} http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/51a6137b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f8eb52a..9b0fb2c 100644 --- a/pom.xml +++ b/pom.xml @@ -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>
