Author: gertv
Date: Wed Dec 8 14:05:28 2010
New Revision: 1043424
URL: http://svn.apache.org/viewvc?rev=1043424&view=rev
Log:
Add sample {snippet} and a few minor fixes
Modified:
servicemix/documentation/trunk/pom.xml
servicemix/documentation/trunk/src/main/scala/scalate/Boot.scala
servicemix/documentation/trunk/src/main/scripts/GenerateComponentDocs.scala
servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-eip.conf
servicemix/documentation/trunk/src/main/webapp/jbi/jbi-guide.conf
Modified: servicemix/documentation/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/pom.xml?rev=1043424&r1=1043423&r2=1043424&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Wed Dec 8 14:05:28 2010
@@ -44,7 +44,9 @@
<pdf.required>false</pdf.required>
- <scalate.version>1.3.1</scalate.version>
+ <scala.version>2.8.1</scala.version>
+
+ <scalate.version>1.4.0-SNAPSHOT</scalate.version>
<scalate.mode>production</scalate.mode>
<scalate.workdir>${basedir}/target/scalateWorkDir</scalate.workdir>
@@ -227,16 +229,30 @@
<artifactId>maven-scalate-plugin</artifactId>
<version>${scalate.version}</version>
<scope>test</scope>
- </dependency>
-
+ </dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14.1</version>
+ <version>2.15.0</version>
<executions>
<execution>
<id>compile</id>
@@ -444,7 +460,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
Modified: servicemix/documentation/trunk/src/main/scala/scalate/Boot.scala
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/scala/scalate/Boot.scala?rev=1043424&r1=1043423&r2=1043424&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/scala/scalate/Boot.scala (original)
+++ servicemix/documentation/trunk/src/main/scala/scalate/Boot.scala Wed Dec 8
14:05:28 2010
@@ -18,9 +18,13 @@
package scalate
import org.fusesource.scalate.util.Logging
+import org.fusesource.scalate.wikitext.Snippets
class Boot extends Logging {
- def run = debug("Boot class started")
+ def run = {
+ debug("Boot class started")
+ Snippets.addPrefix("servicemix",
"http://svn.apache.org/repos/asf/servicemix";)
+ }
}
\ No newline at end of file
Modified:
servicemix/documentation/trunk/src/main/scripts/GenerateComponentDocs.scala
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/scripts/GenerateComponentDocs.scala?rev=1043424&r1=1043423&r2=1043424&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/scripts/GenerateComponentDocs.scala
(original)
+++ servicemix/documentation/trunk/src/main/scripts/GenerateComponentDocs.scala
Wed Dec 8 14:05:28 2010
@@ -71,7 +71,14 @@ def writeElementDocs(component: String,
try {
for (line <- lines.map(_.trim).dropWhile(!_.startsWith("|"))) {
- writer.println(line)
+ // dirty hack to make sure that the {html} macro is processed correctly
+ val result = if (line.endsWith("{html} |")) {
+ val tuple = line.splitAt(line.length - 8)
+ Array(tuple._1, tuple._2)
+ } else {
+ Array(line)
+ }
+ result.foreach(writer.println)
}
writer.flush
} finally {
Modified:
servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-eip.conf
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-eip.conf?rev=1043424&r1=1043423&r2=1043424&view=diff
==============================================================================
---
servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-eip.conf
(original)
+++
servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-eip.conf
Wed Dec 8 14:05:28 2010
@@ -28,3 +28,4 @@ The servicemix-eip component defines sev
- {{eip:resequencer}} :: Implements the Resequencer EIP
- {{eip:async-bridge}} :: Handles an InOut exchange by correlating to separate
InOnly exchanges
+{snippet:id=content-based-router|lang=xml|url=servicemix/components/engines/servicemix-eip/trunk/src/test/resources/org/apache/servicemix/eip/spring.xml|pygmentize=true}
\ No newline at end of file
Modified: servicemix/documentation/trunk/src/main/webapp/jbi/jbi-guide.conf
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/jbi/jbi-guide.conf?rev=1043424&r1=1043423&r2=1043424&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/jbi/jbi-guide.conf (original)
+++ servicemix/documentation/trunk/src/main/webapp/jbi/jbi-guide.conf Wed Dec
8 14:05:28 2010
@@ -13,7 +13,7 @@ h1. JBI Components
{include:jbi/components/servicemix-cxf-se.conf}
{include:jbi/components/servicemix-drools.conf}
{include:jbi/components/servicemix-eip.conf}
-{include jbi/components/servicemix-exec.conf}
+{include:jbi/components/servicemix-exec.conf}
{include:jbi/components/servicemix-file.conf}
{include:jbi/components/servicemix-ftp.conf}
{include:jbi/components/servicemix-http.conf}
