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 2011/02/14 13:11:25 UTC
svn commit: r1070462 - in /servicemix/documentation/trunk: ./
src/main/webapp/quickstart/ src/main/webapp/theme/
src/test/scala/org/apache/servicemix/documentation/
Author: gertv
Date: Mon Feb 14 12:11:24 2011
New Revision: 1070462
URL: http://svn.apache.org/viewvc?rev=1070462&view=rev
Log:
Update to Scalate 1.4.0, fix the build and improve CSS for web
Modified:
servicemix/documentation/trunk/pom.xml
servicemix/documentation/trunk/src/main/webapp/quickstart/camel.conf
servicemix/documentation/trunk/src/main/webapp/quickstart/console.conf
servicemix/documentation/trunk/src/main/webapp/quickstart/installation.conf
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=1070462&r1=1070461&r2=1070462&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Mon Feb 14 12:11:24 2011
@@ -46,7 +46,7 @@
<scala.version>2.8.1</scala.version>
- <scalate.version>1.4.0-SNAPSHOT</scalate.version>
+ <scalate.version>1.4.0</scalate.version>
<scalate.mode>production</scalate.mode>
<scalate.workdir>${basedir}/target/scalateWorkDir</scalate.workdir>
Modified: servicemix/documentation/trunk/src/main/webapp/quickstart/camel.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/quickstart/camel.conf?rev=1070462&r1=1070461&r2=1070462&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/quickstart/camel.conf (original)
+++ servicemix/documentation/trunk/src/main/webapp/quickstart/camel.conf Mon Feb 14 12:11:24 2011
@@ -37,9 +37,7 @@ h2. Using the shell to manage the route
Using {{osgi:list}}, you'll notice that your XML file has been transformed into a bundle and that the Blueprint container has been created to start your Camel route.
-{pygmentize:lang=text}
-[ 209] [Active ] [Created ] [ ] [ 60] quickstart1.xml (0.0.0)
-{pygmentize}
+!/quickstart/images/camel-deploy.png!
From this output, you also learn that the bundle id for your XML file is 209. This allow you to start and stop the route whenever necessary. Let's give this a go now...
Modified: servicemix/documentation/trunk/src/main/webapp/quickstart/console.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/quickstart/console.conf?rev=1070462&r1=1070461&r2=1070462&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/quickstart/console.conf (original)
+++ servicemix/documentation/trunk/src/main/webapp/quickstart/console.conf Mon Feb 14 12:11:24 2011
@@ -58,7 +58,7 @@ karaf@root> log:display | grep DEBUG
!/quickstart/images/log-set-debug.png|title=log:set DEBUG!
-{pygmentize}
+{pygmentize:lang=text}
karaf@root> log:set INFO
{pygmentize}
Modified: servicemix/documentation/trunk/src/main/webapp/quickstart/installation.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/quickstart/installation.conf?rev=1070462&r1=1070461&r2=1070462&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/quickstart/installation.conf (original)
+++ servicemix/documentation/trunk/src/main/webapp/quickstart/installation.conf Mon Feb 14 12:11:24 2011
@@ -41,4 +41,4 @@ $ cd ~/Applications/apache-servicemix-${
$ ./bin/servicemix
{pygmentize}
-!/quickstart/images/start-linux.png!
\ No newline at end of file
+!/quickstart/images/start-linux.png|width=75%|height=75%!
\ 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=1070462&r1=1070461&r2=1070462&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/theme/master.css (original)
+++ servicemix/documentation/trunk/src/main/webapp/theme/master.css Mon Feb 14 12:11:24 2011
@@ -7,7 +7,15 @@ body {
margin: 0px auto;
width: 95%;
font-size: .8em;
- }
+}
+
+p {
+ margin-top: 1em;
+}
+
+img {
+ margin: 1em;
+}
div#siteHeader {
background-color: #76a3cd;
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=1070462&r1=1070461&r2=1070462&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 Mon Feb 14 12:11:24 2011
@@ -17,6 +17,7 @@
*/
package org.apache.servicemix.documentation
+import java.io.File
import org.apache.servicemix.documentation.Helper._
import org.junit.Test
import org.junit.Assert.{assertEquals,assertFalse,assertTrue}
@@ -39,7 +40,7 @@ class HelperTest {
@Test
def testSitegen = {
assertTrue("DummyTemplateEngine is used in scalate:sitegen",
- sitegen(new DummyTemplateEngine(List())))
+ sitegen(new DummyTemplateEngine(Array[File]())))
assertFalse("Any other template engine means we're not in scalate:sitegen",
sitegen(new TemplateEngine()))