You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/11/02 21:27:58 UTC
svn commit: r1030206 - in /servicemix/documentation/trunk: ./ src/main/ant/
src/main/scala/org/apache/servicemix/documentation/ src/main/webapp/
src/main/webapp/WEB-INF/scalate/layouts/ src/main/webapp/images/
src/main/webapp/theme/ src/main/webapp/the...
Author: gertv
Date: Tue Nov 2 20:27:57 2010
New Revision: 1030206
URL: http://svn.apache.org/viewvc?rev=1030206&view=rev
Log:
Merge design updates - thanks to emjohson for providing these patches
Conflicts:
pom.xml
src/main/webapp/jbi/components/servicemix-exec.conf
src/main/webapp/users-guide/manual.conf
src/main/webapp/users-guide/toc.ssp
Added:
servicemix/documentation/trunk/src/main/webapp/commercial.page
servicemix/documentation/trunk/src/main/webapp/contribute.page
servicemix/documentation/trunk/src/main/webapp/images/logodesign.png
servicemix/documentation/trunk/src/main/webapp/images/new-logo.png
servicemix/documentation/trunk/src/main/webapp/theme/picker.css
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/manual.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/toc.ssp
servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/manual.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/toc.ssp
servicemix/documentation/trunk/src/main/webapp/users-guide/index.ssp
servicemix/documentation/trunk/src/main/webapp/users-guide/migration/
servicemix/documentation/trunk/src/main/webapp/users-guide/migration/index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/migration/manual.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/migration/toc.ssp
servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/manual.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/toc.ssp
Removed:
servicemix/documentation/trunk/src/main/webapp/theme/images/bg.png
servicemix/documentation/trunk/src/main/webapp/users-guide/appendices/migration.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/camel-index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/manual.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/toc.ssp
Modified:
servicemix/documentation/trunk/pom.xml
servicemix/documentation/trunk/src/main/ant/generate-pdfs.xml
servicemix/documentation/trunk/src/main/scala/org/apache/servicemix/documentation/Helper.scala
servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
servicemix/documentation/trunk/src/main/webapp/index.ssp
servicemix/documentation/trunk/src/main/webapp/theme/master.css
servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala
Modified: servicemix/documentation/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/pom.xml?rev=1030206&r1=1030205&r2=1030206&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Tue Nov 2 20:27:57 2010
@@ -37,12 +37,9 @@
<properties>
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
-
<jetty-port>8080</jetty-port>
-
<webapp.srcdir>${project.basedir}/src/main/webapp</webapp.srcdir>
<webapp.dir>${project.build.directory}/webapp</webapp.dir>
-
<maven.wagon.version>1.0-beta-6</maven.wagon.version>
<pdf.required>false</pdf.required>
@@ -69,6 +66,11 @@
<version>${scalate.version}</version>
</dependency>
<dependency>
+ <groupId>org.fusesource.scalate</groupId>
+ <artifactId>scalate-page</artifactId>
+ <version>${scalate.version}</version>
+ </dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.24</version>
@@ -220,6 +222,13 @@
<version>4.8</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.fusesource.scalate</groupId>
+ <artifactId>maven-scalate-plugin</artifactId>
+ <version>${scalate.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -233,6 +242,7 @@
<id>compile</id>
<goals>
<goal>compile</goal>
+ <goal>testCompile</goal>
</goals>
</execution>
<execution>
@@ -356,7 +366,6 @@
</archive>
</configuration>
</plugin>
-
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
@@ -368,7 +377,6 @@
<resources>${webapp.srcdir},${webapp.dir}</resources>
</baseResource>
</webAppConfig>
-
<systemProperties>
<systemProperty>
<name>scalate.workdir</name>
@@ -385,7 +393,6 @@
</systemProperties>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -440,7 +447,7 @@
</plugins>
</build>
-
+
<!-- Scalate snapshots -->
<repositories>
<repository>
Modified: servicemix/documentation/trunk/src/main/ant/generate-pdfs.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/ant/generate-pdfs.xml?rev=1030206&r1=1030205&r2=1030206&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/ant/generate-pdfs.xml (original)
+++ servicemix/documentation/trunk/src/main/ant/generate-pdfs.xml Tue Nov 2 20:27:57 2010
@@ -44,11 +44,25 @@
<prince document="jbi/jbi-guide"/>
</target>
- <target name="guide" description="Generate the User Guide PDF">
- <prince document="users-guide/manual"/>
+ <target name="camel" description="Generate the Camel Guide PDF">
+ <prince document="users-guide/camel/manual"/>
</target>
- <target name="all" depends="jbi,guide" description="Generate all the PDF documents">
+ <target name="getting-started" description="Generate the Getting Started Guide PDF">
+ <prince document="users-guide/getting-started/manual"/>
+ </target>
+
+
+ <target name="migration" description="Generate the Migration Guide PDF">
+ <prince document="users-guide/migration/manual"/>
+ </target>
+
+ <target name="nmr" description="Generate the NMR Guide PDF">
+ <prince document="users-guide/nmr/manual"/>
+ </target>
+
+
+ <target name="all" depends="jbi,camel,getting-started,migration,nmr" description="Generate all the PDF documents">
<!-- convenience target to generate all the PDFs -->
</target>
Modified: servicemix/documentation/trunk/src/main/scala/org/apache/servicemix/documentation/Helper.scala
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/scala/org/apache/servicemix/documentation/Helper.scala?rev=1030206&r1=1030205&r2=1030206&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/scala/org/apache/servicemix/documentation/Helper.scala (original)
+++ servicemix/documentation/trunk/src/main/scala/org/apache/servicemix/documentation/Helper.scala Tue Nov 2 20:27:57 2010
@@ -26,12 +26,20 @@ object Helper {
val SITEGEN_ENGINE = "org.fusesource.scalate.maven.DummyTemplateEngine"
val TOC = "/toc.ssp"
+ val SEPARATOR = "/"
/**
* Determine the right toc file to include for a given uri
*/
- def toc(uri: String) = {
- "/" + uri.substring(1).split("/").head + TOC
+ def toc(uri: String): String = toc(uri, !uri.startsWith("/jbi"))
+
+ def toc(uri: String, recursive: Boolean) = {
+ val elements = uri.substring(1).split(SEPARATOR).toSeq
+ val include = recursive match {
+ case true => elements.take(elements.size - 1)
+ case false => elements.take(1)
+ }
+ include.mkString(SEPARATOR, SEPARATOR, TOC)
}
/**
Modified: servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp?rev=1030206&r1=1030205&r2=1030206&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp Tue Nov 2 20:27:57 2010
@@ -16,7 +16,8 @@ See the License for the specific languag
limitations under the License.
--%>
<%@ var body: String %>
-<%@ var title: String = "Apache ServiceMix ${servicemix.version}" %>
+<%@ var title: String = "" %>
+<%@ var style : String = null %>
<%@ var navigation: Boolean = true %>
<% escapeMarkup = false %>
<% import org.fusesource.scalate.servlet.ServletRenderContext._ %>
@@ -24,10 +25,13 @@ limitations under the License.
<!DOCTYPE html>
<html>
<head>
- <title>${title}</title>
+ <title>Apache ServiceMix Documentation - ${title}</title>
<link href="${uri("/theme/master.css")}" rel="stylesheet" type="text/css" />
<link href="${uri("/theme/pygmentize.css")}" rel="stylesheet" type="text/css" />
+ <% if (style != null) { %>
+ <link href="${style}" rel="stylesheet" type="text/css" />
+ <% } %>
<script type="text/javascript" src="${uri("/scripts/jquery.js")}"></script>
<script type="text/javascript" src="${uri("/scripts/jquery.cookie.js")}"></script>
@@ -35,9 +39,9 @@ limitations under the License.
<script>
$(document).ready(function(){
- $("#navigation").jstree({
+ $("#nav").jstree({
"themes": {
- "theme": "classic"
+ "theme": "apple", "dots": false
},
"plugins" : [ "themes", "html_data", "cookies", "themes" ]
});
@@ -45,28 +49,82 @@ limitations under the License.
</script>
</head>
<body>
- <div id="page">
- <header>
- ${title}
- </header>
-
- <div id="main">
+ <div id="siteHeader">
+ <table width="100%">
+ <tr valign="middle">
+ <td align="left">
+ <a href="http://servicemix.apache.org/" title="An open source ESB">
+ <img border="0" src="${uri("/images/logodesign.png")}" height="100"/><img border="0" src="${uri("/images/new-logo.png")}" />
+ </a>
+ </td>
+ <td align="right">
+ <a href="http://www.apache.org/" title="The Apache Sofware Foundation">
+ <img border="0" src="${uri("http://activemq.apache.org/images/asf-logo.png")}">
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <ul class="siteNav">
+ <li ><a href="http://servicemix.apache.org/" title="Overview">Overview</a></li>
+ <li><a href="http://servicemix.apache.org/download.html" title="Download">Download</a></li>
+ <li><a href="/index.html" title="Documentation">Documentation</a></li>
+ <li>
+ <a href="http://servicemix.apache.org/support/index.html" title="Support">Support</a>
+ <ul>
+ <li><a href="http://servicemix.apache.org/support/mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+ <li><a href="http://servicemix.apache.org/support/discussion-forums.html" title="Discussion Forums">Forums</a></li>
+ <li><a href="http://servicemix.apache.org/irc.html" title="IRC">IRC</a></li>
+ <li><a href="http://servicemix.apache.org/support/faq.html" title="FAQ">FAQ</a></li>
+ <li><a href="http://servicemix.apache.org/support/presentations.html" title="Presentations">Presentations</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="http://servicemix.apache.org/contrib/index.html" title="Contributing">Contributing</a>
+ <ul>
+ <li><a href="http://servicemix.apache.org/contrib/becoming-a-committer.html" title="Committing">Become a committer</a></li>
+ <li><a href="http://servicemix.apache.org/contrib/committers-guide.html" title="Committing Guide">Committer Guide</a></li>
+ <li><a href="http://servicemix.apache.org/contrib/source.html" title="Source">Source</a></li>
+ <li><a href="http://issues.apache.org/activemq/browse/SM" title="JIRA">JIRA</a></li>
+ <li><a href="http://servicemix.apache.org/contrib/developers.html" title="Developers">Developer Resources</a></li>
+ </ul>
+ </li>
+ </ul>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="sectHeader">
+ <table width="100%">
+ <tr>
+ <td>
+ <a href="${uri("/index.html")}><h1>Apache ServiceMix Guides</h1></a>
+ </td>
+ <td align="right" valign="middle">
+ <ul class="sectNav">
+ <li><a href="${uri("/index.html")}" title="Home">Home</a></li>
+ <li>Guides</li>
+ <li><a href="${uri("/contribute.html")}">Contribute</a></li>
+ </ul>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="content">
<% if (navigation) { %>
- <nav>
- <div id="navigation">
+ <div id="nav">
${include(toc(requestUri))}
</div>
- </nav>
+ <div id="body">
+ <%= body %>
+ </div>
<% } %>
-
- <div id="body">
+ <% if (!navigation) { %>
<%= body %>
- </div>
+ <% } %>
</div>
-
- <footer>
+ <div id="siteFooter">
<p>Thanks for using Apache ServiceMix!</p>
- </footer>
</div>
</body>
</html>
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/commercial.page
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/commercial.page?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/commercial.page (added)
+++ servicemix/documentation/trunk/src/main/webapp/commercial.page Tue Nov 2 20:27:57 2010
@@ -0,0 +1,30 @@
+---
+<% attributes("title") = "Commercial Guides" %>
+<% attributes("navigation") = false %>
+title: Commercial Documentation
+--- name:content pipeline:markdown
+
+# Commercial Guides
+
+## Books
+
+### Books by ServiceMix Commiters
+
+### Other Books
+
+* [Enterprise Integration Patterns : Designing, Building, and Deploying Messaging Solutions](http://www.amazon.com/exec/obidos/tg/detail/-/0321200683/ref%3Dpd_sim_b_4/002-7139888-4078404?_encoding=UTF8&v=glance) ([EAI Patterns Site](http://www.eaipatterns.com/))
+* [Service Oriented Java Business Integration - Enterprise Service Bus Integration Solutions for Java Developers](http://www.amazon.com/Service-Oriented-Business-Integration-Binildas-Christudas/dp/1847194400) Published by [PACKT](http://www.packtpub.com/service-oriented-java-business-integration/book) Authored by Binildas A. Christudas. ISBN-1847194400
+* Excellent [SOA Books](http://www.soabooks.com/) by Thomas Erl
+* [SOA Design Patterns](http://www.soadesignpatterns.com/) by Thomas Erl
+* [Understanding Enterprise SOA](http://www.amazon.com/exec/obidos/tg/detail/-/1932394591/qid%3D1132084529/sr%3D1-3/ref%3Dsr_1_3/002-7139888-4078404?v=glance&s=books) ([Manning](http://www.manning.com/books/pulier))
+* [Service-Oriented Architecture : A Field Guide to Integrating XML and Web Services](http://www.amazon.com/o/ASIN/0131428985/002-7139888-4078404?SubscriptionId=16H682Z2XJ5FHSFZ3VR2)
+* [Service-Oriented Architecture : Concepts, Technology, and Design](http://www.amazon.com/o/ASIN/0131858580/002-7139888-4078404?SubscriptionId=16H682Z2XJ5FHSFZ3VR2)
+* [Enterprise SOA : Service-Oriented Architecture Best Practices](http://www.amazon.com/o/ASIN/0131465759/002-7139888-4078404?SubscriptionId=16H682Z2XJ5FHSFZ3VR2)
+* [Understanding SOA with Web Services](http://www.amazon.com/exec/obidos/tg/detail/-/0321180860/ref%3Dpd_sim_b_3/002-7139888-4078404?_encoding=UTF8&v=glance)
+* [Web Services Platform Architecture : SOAP, WSDL, WS-Policy, WS-Addressing, WS-BPEL, WS-Reliable Messaging, and More](http://www.amazon.com/exec/obidos/tg/detail/-/0131488740/ref%3Dpd_sim_b_3/002-7139888-4078404?_encoding=UTF8&v=glance)
+* [Web Services and Service-Oriented Architectures: The Savvy Manager's Guide](http://www.amazon.com/exec/obidos/tg/detail/-/1558609067/ref%3Dpd_sim_b_6/002-7139888-4078404?_encoding=UTF8&v=glance)
+* [Loosely Coupled: The Missing Pieces of Web Services](http://www.amazon.com/exec/obidos/tg/detail/-/1881378241/ref%3Dpd_sim_b_4/002-7139888-4078404?_encoding=UTF8&v=glance)
+
+## Enterprise Documentation
+
+* [Fuse ESB Documentation](http://fusesource.com/documentation/fuse_esb_documentation) - Documentation for the FUSE ESB distribution of ServiceMix 4.x.
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/contribute.page
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/contribute.page?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/contribute.page (added)
+++ servicemix/documentation/trunk/src/main/webapp/contribute.page Tue Nov 2 20:27:57 2010
@@ -0,0 +1,34 @@
+---
+<% attributes("title") = "Contributing" %>
+<% attributes("navigation") = false %>
+title: Contributing
+--- name:content pipeline:markdown
+
+# Contributing to the Documentation
+
+## Getting the Source
+
+## Editing the Source
+
+The documentation is written in a combination of mark-up languages. Most of the pages are written
+using Comfluence mark-up or Markdown. The pages can be editied in any text editor.
+
+Pages are grouped into books using the `toc.ssp` file in the enclosing folder. This file contains
+an HTML formated list defining the TOC for a book.
+
+## Building
+You can build the documentation as follows:
+
+ {pygmentize:: text}
+ mvn install
+ {pygmentize}
+
+If you want to edit the files in your text editor and be able to immediately see the site re-rendered in a browser then use
+
+ {pygmentize:: text}
+ mvn jetty:run
+ {pygmentize}
+
+You can now surf the site and see changes immediately.
+
+If you are on OS X then we highly recommend [TextMate](http://macromates.com/) as a great editor which supports Textile and Markdown
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/images/logodesign.png
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/images/logodesign.png?rev=1030206&view=auto
==============================================================================
Files servicemix/documentation/trunk/src/main/webapp/images/logodesign.png (added) and servicemix/documentation/trunk/src/main/webapp/images/logodesign.png Tue Nov 2 20:27:57 2010 differ
Added: servicemix/documentation/trunk/src/main/webapp/images/new-logo.png
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/images/new-logo.png?rev=1030206&view=auto
==============================================================================
Files servicemix/documentation/trunk/src/main/webapp/images/new-logo.png (added) and servicemix/documentation/trunk/src/main/webapp/images/new-logo.png Tue Nov 2 20:27:57 2010 differ
Modified: servicemix/documentation/trunk/src/main/webapp/index.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/index.ssp?rev=1030206&r1=1030205&r2=1030206&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/index.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/index.ssp Tue Nov 2 20:27:57 2010
@@ -1,41 +1,35 @@
<% import org.apache.servicemix.documentation.Helper._ %>
+<% attributes("title") = "Home" %>
<% attributes("navigation") = false %>
-
+<% attributes("style") = uri("/theme/picker.css") %>
<div id="bookpicker">
-<h1></h1>
-
<div class="left">
- <h2>Quickstart<br/>Guide</h2>
+ <h2>Quickstart Guide</h2>
</div>
<div class="right">
- If you're new to Apache ServiceMix, this document will guide you in your first steps in Apache ServiceMix.
+ <p>If you're new to Apache ServiceMix, this document will guide you in your first steps in Apache ServiceMix.</p>
</div>
<div class="left">
<a href="users-guide/index.html">
- <h2>ServiceMix<br/>Manual</h2>
+ <h2>User Guides</h2>
</a>
</div>
<div class="right">
- The full reference manual, explaining about all the features and components in Apache ServiceMix
- <% if (sitegen(engine)) { %>
- <div class="pdf">
- <a href="users-guide/manual.pdf" class="pdf">PDF document</a>
- </div>
- <% } %>
+ <p>Guides explaining all of the features and components in Apache ServiceMix.</p>
</div>
<div class="left">
<a href="jbi/index.html">
- <h2>ServiceMix<br/>JBI Manual</h2>
+ <h2>ServiceMix JBI Manual</h2>
</a>
</div>
<div class="right">
- Information about the JBI (Java Business Integration) support in Apache ServiceMix and a description for all the JBI components.
+ <p>Information about the JBI (Java Business Integration) support in Apache ServiceMix and a description for all the JBI components.</p>
<% if (sitegen(engine)) { %>
<div class="pdf">
<a href="jbi/jbi-guide.pdf" class="pdf">PDF document</a>
@@ -45,12 +39,12 @@
<div class="left">
<a href="karaf/index.html">
- <h2>Karaf<br/>Manual</h2>
+ <h2>Karaf Manual</h2>
</a>
</div>
<div class="right">
- Apache ServiceMix uses Apache Karaf as the underlying OSGi server runtime. This manual will explain the features and functionality provided by Karaf.
+ <p>Apache ServiceMix uses Apache Karaf as the underlying OSGi server runtime. This manual will explain the features and functionality provided by Karaf.</p>
</div>
<div class="left">
@@ -60,8 +54,16 @@
</div>
<div class="right">
- Help pages for all the available commands in the Apache ServiceMix console.
+ <p>Help pages for all the available commands in the Apache ServiceMix console.</p>
</div>
+<div class="left">
+ <a href="commercial.html">
+ <h2>Commercial Guides</h2>
+ </a>
+</div>
+<div class="right">
+ <p>Documentation from commercial providers and books you can buy.</p>
</div>
+</div>
\ No newline at end of file
Modified: servicemix/documentation/trunk/src/main/webapp/theme/master.css
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/theme/master.css?rev=1030206&r1=1030205&r2=1030206&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/theme/master.css (original)
+++ servicemix/documentation/trunk/src/main/webapp/theme/master.css Tue Nov 2 20:27:57 2010
@@ -3,89 +3,155 @@
}
body {
- font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
+ font-family: Verdana, Arial, sans-serif;
margin: 0px auto;
width: 95%;
- box-shadow: 3px 3px 7px #777;
font-size: .8em;
-}
+ }
-nav {
- display: block;
- width: 20em;
- float: left;
- margin: 0px;
- margin-bottom: 30px;
+div#siteHeader {
+ background-color: #76a3cd;
+ padding-left: 20px;
+ padding-right: 20px;
+ clear: both;
}
-header {
- width: 100%;
- height: 50px;
- background: url('images/bg.png') repeat-x right top;
- font-size: 1.5em;
- font-weight: bold;
+div#siteHeader a:link {
color: #ffffff;
- text-align: center;
+ text-decoration: none;
}
-footer {
- height: 25px;
- background: url('images/bg.png') repeat-x right top;
- margin-top: 30px;
- clear: both;
+div#siteHeader a:visited {
+ color: #ffffff;
+ text-decoration: none;
}
-footer p {
- color: #fff;
- text-align: right;
+div#siteHeader a:hover {
+ color: #ffffff;
}
-div#body {
- padding-left: 23.5em;
- margin-bottom: 30px;
+div#siteHeader table, div#siteHeader td {
+ border: none;
+ vertical-align: middle;
+}
+
+ul.siteNav {
+ list-style-type: none;
+ padding:0;
+ margin:0;
+ position: relative;
+ left:40%;
+ }
+
+ul.siteNav li {
+ display: inline;
+ float: left;
+ padding: 0 20px;
+ }
+
+ul.siteNav li ul {
+ position:absolute;
+ margin-top:-1em;
+ margin-left:.5em;
+ display: none;
+ }
+
+ul.siteNav li a {
+ text-decoration: none;
+ padding: 5px;
+ }
+
+ul.siteNav li:hover ul {
+display: block;
+}
+
+ul.siteNav li ul {
+ list-style-type: none;
+ padding:0;
+ margin:0;
+ margin-top:5px;
+ margin-bottom:5px;
+ background-color: #76a3cd;
}
-div#body h2 {
- margin-left: -1em;
- padding-top: 10px;
+ul.siteNav li ul li {
+ clear: both;
+ margin:3px;
+ padding:3px;
}
-div#body h3 {
- padding-top: 20px;
- margin-left: -1em;
-}
+div#sectHeader {
+ background: #909090;
+ height: 50px;
+ color: #ffffff;
+ padding-left: 20px;
+ padding-right: 20px;
+ vertical-align: top;
+ clear: both;
+ }
-div#body h4 {
- padding-top: 10px;
- padding-bottom: 5px;
+div#sectHeader a:link {
+ color: #ffffff;
+ text-decoration: none;
}
-div#body table tr {
- border: solid thin black;
+div#sectHeader a:visited {
+ color: #ffffff;
+ text-decoration: none;
}
-div#body table {
- border-spacing: 0px 0px;
- border: solid thin #777777;
- margin-left: 1em;
- width: 90%
+div#sectHeader a:hover {
+ color: #ffffff;
}
-div#body table tr td {
- border: solid thin #ededed;
- padding: 2px;
- font-size: .9em;
+div#sectHeader table, div#sectHeader td {
+ border: none;
+ }
+
+div#sectHeader h1 {
+ border: none;
+ padding: 0;
+ margin: 0;
+ }
+
+ul.sectNav {
+ list-style-type: none;
+ }
+
+ul.sectNav li {
+ display: inline;
+ font-size: large;
+ padding: 0 40px;
+ }
+
+div#siteFooter {
+ height: 25px;
+ background-color: #76a3cd;
+ margin-top: 30px;
+ color: #ffffff;
+ text-align: right;
+ vertical-align: bottom;
+ clear: both;
+ padding-left: 20px;
+ padding-right: 20px;
}
-div#body table tr th {
- border: solid thin #ededed;
- background-color: #ededed;
- padding: 2px;
- font-size: .9em;
+div#content {
+ clear: both;
+ margin: 30px;
}
-div#page {
- border: solid thin black;
+div#body {
+ padding-left: 22.5em;
+ margin-bottom: 30px;
+ }
+
+div#nav {
+ display: block;
+ width: 20em;
+ float: left;
+ margin: 0px;
+ margin-bottom: 30px;
}
div.highlight pre {
@@ -95,8 +161,6 @@ div.highlight pre {
margin-left: 1em;
margin-right: 1em;
padding: .5em;
- margin-top: .5em;
- margin-bottom: .5em;
}
tt {
@@ -104,36 +168,104 @@ tt {
font-size: 1em;
}
-div#bookpicker {
- margin-left: -20em;
- width: 700px;
+div.tip, div.warn, div.note {
+ position: relative;
+ left: 20px;
+ padding: 10px;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ width: 90%;
+}
+
+div.tip h1:before {
+ content:url(/images/check.gif);
+ padding-right: 10px;
}
-div.left {
- clear: both;
- float: left;
- text-align: right;
- width: 200px;
- margin-top: 1em;
- margin-bottom: 1em;
+div.tip h1, div.warn h1, div.note h1 {
+ font-size: small;
+ padding-bottom: 5px;
+ margin: 0;
+ border-bottom: none;
}
-div.left h2 {
- color: #333333;
+div.tip {
+ background-color: #DDFADE;
+ border-color: #9EC49F;
}
-div.right {
- float: right;
- text-align: left;
- width: 450px;
- margin: auto;
- color: #666666;
- font-size: 120%;
- margin-top: 1em;
- margin-bottom: .75em;
+div.warn {
+ background-color: #FFE7E7;
+ border-color: #DF9898;
}
-div.pdf {
- padding-left: 20px;
- background: url('images/pdf.png') no-repeat left center;
+div.note {
+ background-color: #FFFFDD;
+ border-color: #F7DF92;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ line-height: normal;
+ font-weight: bold;
+ padding: 2px;
+}
+
+h1 {
+ margin: 36px 0 4px 0;
+ border-bottom: 1px solid #919699;
+}
+
+h2 {
+ margin: 27px 0 4px 0;
+ border-bottom: 1px solid #919699;
+}
+
+h3 {
+ margin: 21px 0 4px 0;
+}
+
+h4 {
+ margin: 18px 0 4px 0;
+}
+
+h5 {
+ margin: 14px 0 4px 0;
+}
+
+h6 {
+ margin: 14px 0 4px 0;
+}
+
+table {
+ margin: 5px;
+ border-collapse: collapse;
+}
+
+td {
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ddd;
+ padding: 5px;
+ vertical-align: top;
+ min-width: 0.6em;
+}
+
+th {
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ddd;
+ padding: 5px;
+ background-color: #f0f0f0;
+ text-align: left;
+ vertical-align: top;
+ min-width: 0.6em;
+}
+
+a {
+ color: #5b8fbe;
+ text-decoration: none;
+}
+
+a:hover {
+ color: #666;
}
Added: servicemix/documentation/trunk/src/main/webapp/theme/picker.css
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/theme/picker.css?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/theme/picker.css (added)
+++ servicemix/documentation/trunk/src/main/webapp/theme/picker.css Tue Nov 2 20:27:57 2010
@@ -0,0 +1,40 @@
+div#bookpicker {
+ width: 90%;
+ }
+
+div#bookpicker a {
+ text-decoration: none;
+ }
+
+div.left h1, div.left h2 {
+ overflow: visible;
+ border-bottom: none;
+ margin: 0;
+ padding: 0;
+}
+
+ div.left {
+ float:left;
+ width:30%;
+ text-align:right;
+ clear:both;
+ padding-bottom: 10px;
+}
+
+div.left h2 {
+ color: #5C5C5C;
+ font-size: 14pt;
+ margin-right: 20px;
+}
+
+div.right {
+ float:right;
+ width:70%;
+ text-align:left;
+ padding-bottom: 10px;
+ }
+
+div.pdf {
+ padding-left: 20px;
+ background: url('images/pdf.png') no-repeat left center;
+}
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf Tue Nov 2 20:27:57 2010
@@ -0,0 +1 @@
+h1. Using Camel
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/camel/manual.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/camel/manual.conf?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/camel/manual.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/camel/manual.conf Tue Nov 2 20:27:57 2010
@@ -0,0 +1,5 @@
+{attributes:layout=/WEB-INF/scalate/layouts/print.ssp}
+{attributes:title=User's Manual}
+
+{include:users-guide/camel/index.conf}
+{include:users-guide/camel/camel-deployment.conf}
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/camel/toc.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/camel/toc.ssp?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/camel/toc.ssp (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/camel/toc.ssp Tue Nov 2 20:27:57 2010
@@ -0,0 +1,8 @@
+<ul>
+ <li id="camel">
+ <a href="${uri("/users-guide/camel/index.html")}">Using Camel</a>
+ <ul>
+ <li id="camel-deploy"><a href="${uri("/users-guide/camel/camel-deployment.html")}">Deployment options</a></li>
+ </ul>
+ </li>
+</ul>
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/index.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/index.conf?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/index.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/index.conf Tue Nov 2 20:27:57 2010
@@ -0,0 +1 @@
+h1. Getting Started with Apache ServiceMix
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/manual.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/manual.conf?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/manual.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/manual.conf Tue Nov 2 20:27:57 2010
@@ -0,0 +1,8 @@
+{attributes:layout=/WEB-INF/scalate/layouts/print.ssp}
+{attributes:title=User's Manual}
+
+{include:users-guide/getting-started/index.conf}
+{include:users-guide/getting-started/what-is-smx4.conf}
+{include:users-guide/getting-started/installation.conf}
+{include:users-guide/getting-started/discover.conf}
+{include:users-guide/getting-started/technology-selection.conf}
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/toc.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/toc.ssp?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/toc.ssp (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/toc.ssp Tue Nov 2 20:27:57 2010
@@ -0,0 +1,11 @@
+<ul>
+ <li id="getting-started">
+ <a href="${uri("/users-guide/getting-started/index.html")}">Getting Started</a>
+ <ul>
+ <li id="what-is-smx4"><a href="${uri("/users-guide/getting-started/what-is-smx4.html")}">What is ServiceMix 4?</a></li>
+ <li id="installation"><a href="${uri("/users-guide/getting-started/installation.html")}">Installing ServiceMix</a></li>
+ <li id="discover"><a href="${uri("/users-guide/getting-started/discover")}">Discover ServiceMix</a></li>
+ <li id="technology-selection"><a href="${uri("/users-guide/getting-started/technology-selection.html")}">Technology selection guidelines</a></li>
+ </ul>
+ </li>
+</ul>
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/index.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/index.ssp?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/index.ssp (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/index.ssp Tue Nov 2 20:27:57 2010
@@ -0,0 +1,64 @@
+<% import org.apache.servicemix.documentation.Helper._ %>
+<% attributes("title") = "User Guides" %>
+<% attributes("navigation") = false %>
+<% attributes("style") = uri("/theme/picker.css") %>
+<div id="bookpicker">
+
+<div class="left">
+ <a href="getting-started/index"><h2>Getting Started</h2></a>
+</div>
+
+<div class="right">
+ <p>This guide will get you familiar with Apache ServiceMix.</p>
+ <% if (sitegen(engine)) { %>
+ <div class="pdf">
+ <a href="getting-started/manual.pdf" class="pdf">PDF document</a>
+ </div>
+ <% } %>
+</div>
+
+<div class="left">
+ <a href="camel/index.html">
+ <h2>Using Camel</h2>
+ </a>
+</div>
+
+<div class="right">
+ <p>Guide to using Apache Camel for data mediation in Apache ServiceMix.</p>
+ <% if (sitegen(engine)) { %>
+ <div class="pdf">
+ <a href="camel/manual.pdf" class="pdf">PDF document</a>
+ </div>
+ <% } %>
+</div>
+
+<div class="left">
+ <a href="nmr/index.html">
+ <h2>Using the NMR</h2>
+ </a>
+</div>
+
+<div class="right">
+ <p>Guide to using the Apache ServiceMix NMR to move messages between endpoints inside the ESB.</p>
+ <% if (sitegen(engine)) { %>
+ <div class="pdf">
+ <a href="nmr/manual.pdf" class="pdf">PDF document</a>
+ </div>
+ <% } %>
+</div>
+
+<div class="left">
+ <a href="migration/index.html">
+ <h2>Migration Guide</h2>
+ </a>
+</div>
+
+<div class="right">
+ <p>Information in migrating to the latest version of Apache ServiceMix.</p>
+ <% if (sitegen(engine)) { %>
+ <div class="pdf">
+ <a href="migration/manual.pdf" class="pdf">PDF document</a>
+ </div>
+ <% } %>
+</div>
+</div>
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/migration/index.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/migration/index.conf?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/migration/index.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/migration/index.conf Tue Nov 2 20:27:57 2010
@@ -0,0 +1,2 @@
+h1. Migrating from ServiceMix 3.x to ServiceMix 4.x
+// TODO: write this bit
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/migration/manual.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/migration/manual.conf?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/migration/manual.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/migration/manual.conf Tue Nov 2 20:27:57 2010
@@ -0,0 +1,4 @@
+{attributes:layout=/WEB-INF/scalate/layouts/print.ssp}
+{attributes:title=Migration Guide}
+
+{include:users-guide/migration/index.conf}
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/migration/toc.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/migration/toc.ssp?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/migration/toc.ssp (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/migration/toc.ssp Tue Nov 2 20:27:57 2010
@@ -0,0 +1,11 @@
+<ul>
+ <li id="migration">
+ <a href="${uri("/users-guide/migration/index.html")}">Migration Guide</a>
+ <ul>
+ <li id="what-is-smx4"><a href="${uri("/users-guide/getting-started/what-is-smx4.html")}">What is ServiceMix 4?</a></li>
+ <li id="installation"><a href="${uri("/users-guide/getting-started/installation.html")}">Installing ServiceMix</a></li>
+ <li id="discover"><a href="${uri("/users-guide/getting-started/discover")}">Discover ServiceMix</a></li>
+ <li id="technology-selection"><a href="${uri("/users-guide/getting-started/technology-selection.html")}">Technology selection guidelines</a></li>
+ </ul>
+ </li>
+</ul>
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/index.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/index.conf?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/index.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/index.conf Tue Nov 2 20:27:57 2010
@@ -0,0 +1,3 @@
+h2. Using the NMR
+
+//TODO: Add some info about the NMR
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/manual.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/manual.conf?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/manual.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/manual.conf Tue Nov 2 20:27:57 2010
@@ -0,0 +1,6 @@
+{attributes:layout=/WEB-INF/scalate/layouts/print.ssp}
+{attributes:title=Using the NMR}
+
+{include:users-guide/index}
+{include:users-guide/nmr-camel}
+{include:users-guide/nmr-event-listeners}
\ No newline at end of file
Added: servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/toc.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/toc.ssp?rev=1030206&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/toc.ssp (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/toc.ssp Tue Nov 2 20:27:57 2010
@@ -0,0 +1,10 @@
+<ul>
+ <li id="nmr">
+
+ <a href="/users-guide/nmr/index.html">Using the NMR</a>
+ <ul>
+ <li id="camel-nmr"><a href="/users-guide/nmr/nmr-camel.html">Camel NMR</a></li>
+ <li id="nmr-event-listeners"><a href="/users-guide/nmr/nmr-event-listeners.html">Event Listeners</a></li>
+ </ul>
+ </li>
+</ul>
\ No newline at end of file
Modified: servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala?rev=1030206&r1=1030205&r2=1030206&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala (original)
+++ servicemix/documentation/trunk/src/test/scala/org/apache/servicemix/documentation/HelperTest.scala Tue Nov 2 20:27:57 2010
@@ -30,8 +30,10 @@ class HelperTest {
@Test
def testTocHelper = {
- assertEquals("Should return valid TOC for /users-guide/index.conf",
- "/users-guide/toc.ssp", toc("/users-guide/index.conf"))
+ assertValidToc("/users-guide/toc.ssp", "/users-guide/index.conf")
+ assertValidToc("/users-guide/camel/toc.ssp", "/users-guide/camel/index.conf")
+ assertValidToc("/jbi/toc.ssp", "/jbi/components/index.html")
+
}
@Test
@@ -43,4 +45,9 @@ class HelperTest {
}
+ def assertValidToc(expected: String, location: String): Unit = {
+ assertEquals("Should return valid TOC for " + location,
+ expected, toc(location))
+ }
+
}