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 2013/11/30 19:33:43 UTC
svn commit: r1546762 - in /karaf/trunk/manual/src/main/webapp: ./
users-guide/
Author: jbonofre
Date: Sat Nov 30 18:33:42 2013
New Revision: 1546762
URL: http://svn.apache.org/r1546762
Log:
[KARAF-2511] Refactore the user guide ToC
Added:
karaf/trunk/manual/src/main/webapp/users-guide/console.conf
- copied, changed from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/using-console.conf
karaf/trunk/manual/src/main/webapp/users-guide/deployers.conf
- copied, changed from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/deployer.conf
karaf/trunk/manual/src/main/webapp/users-guide/log.conf
- copied, changed from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/logging-system.conf
karaf/trunk/manual/src/main/webapp/users-guide/monitoring.conf
- copied, changed from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/jmx.conf
karaf/trunk/manual/src/main/webapp/users-guide/remote.conf
- copied, changed from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/remote-console.conf
karaf/trunk/manual/src/main/webapp/users-guide/tuning.conf
- copied, changed from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/jre-tuning.conf
karaf/trunk/manual/src/main/webapp/users-guide/webconsole.conf
- copied, changed from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/web-console.conf
karaf/trunk/manual/src/main/webapp/users-guide/webcontainer.conf
- copied, changed from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf
Removed:
karaf/trunk/manual/src/main/webapp/users-guide/deployer.conf
karaf/trunk/manual/src/main/webapp/users-guide/jmx.conf
karaf/trunk/manual/src/main/webapp/users-guide/jre-tuning.conf
karaf/trunk/manual/src/main/webapp/users-guide/logging-system.conf
karaf/trunk/manual/src/main/webapp/users-guide/remote-console.conf
karaf/trunk/manual/src/main/webapp/users-guide/using-console.conf
karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf
karaf/trunk/manual/src/main/webapp/users-guide/web-console.conf
Modified:
karaf/trunk/manual/src/main/webapp/_navigation.conf
karaf/trunk/manual/src/main/webapp/manual.conf
karaf/trunk/manual/src/main/webapp/users-guide/index.conf
Modified: karaf/trunk/manual/src/main/webapp/_navigation.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/_navigation.conf?rev=1546762&r1=1546761&r2=1546762&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/_navigation.conf (original)
+++ karaf/trunk/manual/src/main/webapp/_navigation.conf Sat Nov 30 18:33:42 2013
@@ -9,22 +9,26 @@ h3. [Users Guide|/users-guide/index]
- [Directory structure|/users-guide/directory-structure]
- [Start, stop, restart, connect|/users-guide/start-stop]
- [Integration in the operating system: the Service Wrapper|/users-guide/wrapper]
+- [Console|/users-guide/console]
+- [Remote|/users-guide/remote]
+- [Log|/users-guide/log]
- [Configuration|/users-guide/configuration]
-- [Using the console|/users-guide/using-console]
-- [Web console|/users-guide/web-console]
-- [Remote console|/users-guide/remote-console]
-- [Web console|/users-guide/web-console]
-- [Deployer|/users-guide/deployer]
+- [Provisioning and features|/users-guide/provisioning]
+- [KAR|/users-guide/kar]
+- [Deployers|/users-guide/deployers]
- [Instances|/users-guide/instances]
- [Security|/users-guide/security]
-- [Failover Deployments|/users-guide/failover]
-- [Log|/users-guide/logging-system]
-- [Provisioning|/users-guide/provisioning]
-- [KAR archive|/users-guide/kar]
-- [JRE tuning|/users-guide/jre-tuning]
-- [Web applications|/users-guide/web-applications]
-- [HTTP service|/users-guide/http]
-- [JMX for monitoring and administration|/users-guide/jmx]
+- Enterprise
+-- [WebContainer (JSP/Servlet)|/users-guide/webcontainer]
+-- Naming (JNDI)
+-- Transaction (JTA)
+-- DataSource (JDBC)
+-- MOM (JMS)
+-- Persistence (JPA)
+-- [HA/failover and cluster|/users-guide/failover]
+- [Monitoring|/users-guide/monitoring]
+- [WebConsole|/users-guide/webconsole]
+- [Tuning|/users-guide/tuning]
h3. [Developers Guide|/developers-guide/index]
Modified: karaf/trunk/manual/src/main/webapp/manual.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/manual.conf?rev=1546762&r1=1546761&r2=1546762&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/manual.conf (original)
+++ karaf/trunk/manual/src/main/webapp/manual.conf Sat Nov 30 18:33:42 2013
@@ -38,23 +38,21 @@ h1. Users Guide
{include:users-guide/directory-structure.conf}
{include:users-guide/start-stop.conf}
{include:users-guide/wrapper.conf}
+{include:users-guide/console.conf}
+{include:users-guide/remote.conf}
+{include:users-guide/log}
{include:users-guide/configuration.conf}
-{include:users-guide/using-console.conf}
-{include:users-guide/web-console.conf}
-{include:users-guide/remote-console.conf}
-{include:users-guide/deployer.conf}
-{include:users-guide/instances.conf}
-{include:users-guide/security.conf}
-{include:users-guide/failover.conf}
-{include:users-guide/logging-system.conf}
{include:users-guide/provisioning.conf}
-{include:users-guide/provisioning-schema.conf}
-{include:users-guide/kar.conf}
-{include:users-guide/jre-tuning.conf}
-{include:users-guide/web-applications.conf}
-{include:users-guide/http.conf}
-{include:users-guide/jmx.conf}
-{include:users-guide/update.conf}
+{include:users-guide/kar}
+{include:users-guide/deployers}
+{include:users-guide/instances}
+{include:users-guide/security}
+{include:users-guide/enterprise}
+{include:users-guide/webcontainer}
+{include:users-guide/failover}
+{include:users-guide/monitoring}
+{include:users-guide/webconsole}
+{include:users-guide/tuning}
h1. Developers Guide
{include:developers-guide/connect-console.conf}
Copied: karaf/trunk/manual/src/main/webapp/users-guide/console.conf (from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/using-console.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/console.conf?p2=karaf/trunk/manual/src/main/webapp/users-guide/console.conf&p1=karaf/trunk/manual/src/main/webapp/users-guide/using-console.conf&r1=1546733&r2=1546762&rev=1546762&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/manual/src/main/webapp/users-guide/deployers.conf (from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/deployer.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/deployers.conf?p2=karaf/trunk/manual/src/main/webapp/users-guide/deployers.conf&p1=karaf/trunk/manual/src/main/webapp/users-guide/deployer.conf&r1=1546733&r2=1546762&rev=1546762&view=diff
==============================================================================
(empty)
Modified: karaf/trunk/manual/src/main/webapp/users-guide/index.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/index.conf?rev=1546762&r1=1546761&r2=1546762&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/index.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/index.conf Sat Nov 30 18:33:42 2013
@@ -1,23 +1,26 @@
-h1. Karaf Users Guide
+h1. Users Guide
* [Installation|installation]
* [Directory structure|directory-structure]
* [Start, stop, restart, connect|start-stop]
* [Integration in the operating system: the Service Wrapper|wrapper]
+* [Console|console]
+* [Remote|remote]
+* [Log|log]
* [Configuration|configuration]
-* [Using the console|using-console]
-* [Web console|web-console]
-* [Remote console|remote-console]
-* [Deployer|/users-guide/deployer]
+* [Provisioning and features|provisioning]
+* [KAR|kar]
+* [Deployers|deployers]
* [Instances|instances]
* [Security|security]
-* [Failover Deployments|failover]
-* [Log|logging-system]
-* [Provisioning|provisioning]
-* [Provisioning Schema|provisioning-schema]
-* [Karaf Archive|kar]
-* [JRE Packages Tuning|jre-tuning]
-* [Web applications|/users-guide/web-applications]
-* [Pax Web (OSGi HttpService)|/users-guide/http]
-* [Monitoring and Administration using JMX|/users-guide/jmx]
-* [Update procedure|/users-guide/update]
+* [Enterprise|enterprise]
+** [WebContainer (JSP/Servlet)|webcontainer]
+** Naming (JNDI)
+** Transaction (JTA)
+** DataSource (JDBC)
+** MOM (JMS)
+** Persistence (JPA)
+** [HA/failover and cluster|failover]
+* [Monitoring|monitoring]
+* [WebConsole|webconsole]
+* [Tuning|tuning]
Copied: karaf/trunk/manual/src/main/webapp/users-guide/log.conf (from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/logging-system.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/log.conf?p2=karaf/trunk/manual/src/main/webapp/users-guide/log.conf&p1=karaf/trunk/manual/src/main/webapp/users-guide/logging-system.conf&r1=1546733&r2=1546762&rev=1546762&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/manual/src/main/webapp/users-guide/monitoring.conf (from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/jmx.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/monitoring.conf?p2=karaf/trunk/manual/src/main/webapp/users-guide/monitoring.conf&p1=karaf/trunk/manual/src/main/webapp/users-guide/jmx.conf&r1=1546733&r2=1546762&rev=1546762&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/manual/src/main/webapp/users-guide/remote.conf (from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/remote-console.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/remote.conf?p2=karaf/trunk/manual/src/main/webapp/users-guide/remote.conf&p1=karaf/trunk/manual/src/main/webapp/users-guide/remote-console.conf&r1=1546733&r2=1546762&rev=1546762&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/manual/src/main/webapp/users-guide/tuning.conf (from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/jre-tuning.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/tuning.conf?p2=karaf/trunk/manual/src/main/webapp/users-guide/tuning.conf&p1=karaf/trunk/manual/src/main/webapp/users-guide/jre-tuning.conf&r1=1546733&r2=1546762&rev=1546762&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/manual/src/main/webapp/users-guide/webconsole.conf (from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/web-console.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/webconsole.conf?p2=karaf/trunk/manual/src/main/webapp/users-guide/webconsole.conf&p1=karaf/trunk/manual/src/main/webapp/users-guide/web-console.conf&r1=1546733&r2=1546762&rev=1546762&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/manual/src/main/webapp/users-guide/webcontainer.conf (from r1546733, karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/webcontainer.conf?p2=karaf/trunk/manual/src/main/webapp/users-guide/webcontainer.conf&p1=karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf&r1=1546733&r2=1546762&rev=1546762&view=diff
==============================================================================
(empty)