Initial commit -- merging sandbox projects into a single project
git-svn-id: https://svn.apache.org/repos/asf/servicemix/documentation/trunk@940421 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.gitignore b/.gitignore
index 1de5659..35e65af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
-target
\ No newline at end of file
+target
+.settings
+.classpath
+.project
+*.i??
\ No newline at end of file
diff --git a/common/pom.xml b/common/pom.xml
index 5666ed5..9558a45 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.docs</groupId>
<artifactId>parent</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.3-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
diff --git a/docs/jbi/pom.xml b/docs/jbi/pom.xml
index 147b055..60b9d28 100644
--- a/docs/jbi/pom.xml
+++ b/docs/jbi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>docs</artifactId>
<groupId>org.apache.servicemix.docs</groupId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/docs/quickstart/pom.xml b/docs/manual/pom.xml
similarity index 87%
rename from docs/quickstart/pom.xml
rename to docs/manual/pom.xml
index 2e0591c..61af72a 100644
--- a/docs/quickstart/pom.xml
+++ b/docs/manual/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.servicemix.docs</groupId>
<artifactId>docs</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.3-SNAPSHOT</version>
</parent>
<artifactId>quickstart</artifactId>
<packaging>pom</packaging>
- <name>Apache ServiceMix :: Documentation :: Quickstart Guide</name>
- <description>The ServiceMix Getting Started Guide</description>
+ <name>Apache ServiceMix :: Documentation :: Programmer's Manual</name>
+ <description>The ServiceMix Programmer's Guide</description>
</project>
diff --git a/docs/manual/src/docbkx/clustering.xml b/docs/manual/src/docbkx/clustering.xml
new file mode 100644
index 0000000..03832a5
--- /dev/null
+++ b/docs/manual/src/docbkx/clustering.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<chapter id="clustering"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>Clustering and High Availability</title>
+ <para>TODO</para>
+</chapter>
diff --git a/docs/manual/src/docbkx/discover.xml b/docs/manual/src/docbkx/discover.xml
new file mode 100644
index 0000000..e55485e
--- /dev/null
+++ b/docs/manual/src/docbkx/discover.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<chapter id="discover"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>Discover servicemix 4 (through simple examples)</title>
+ <para>TODO</para>
+</chapter>
diff --git a/docs/manual/src/docbkx/images/draft.png b/docs/manual/src/docbkx/images/draft.png
new file mode 100644
index 0000000..0084708
--- /dev/null
+++ b/docs/manual/src/docbkx/images/draft.png
Binary files differ
diff --git a/docs/manual/src/docbkx/images/smx4-dev-framework-debug.gif b/docs/manual/src/docbkx/images/smx4-dev-framework-debug.gif
new file mode 100644
index 0000000..4b7f538
--- /dev/null
+++ b/docs/manual/src/docbkx/images/smx4-dev-framework-debug.gif
Binary files differ
diff --git a/docs/manual/src/docbkx/images/smx4-dev-framework-nodebug.gif b/docs/manual/src/docbkx/images/smx4-dev-framework-nodebug.gif
new file mode 100644
index 0000000..53d1405
--- /dev/null
+++ b/docs/manual/src/docbkx/images/smx4-dev-framework-nodebug.gif
Binary files differ
diff --git a/docs/manual/src/docbkx/images/smx4-dev-framework.bmp b/docs/manual/src/docbkx/images/smx4-dev-framework.bmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/docs/manual/src/docbkx/images/smx4-dev-framework.bmp
diff --git a/docs/manual/src/docbkx/images/smx4-dev-showtree.gif b/docs/manual/src/docbkx/images/smx4-dev-showtree.gif
new file mode 100644
index 0000000..3553e1c
--- /dev/null
+++ b/docs/manual/src/docbkx/images/smx4-dev-showtree.gif
Binary files differ
diff --git a/docs/manual/src/docbkx/images/smx4-start.gif b/docs/manual/src/docbkx/images/smx4-start.gif
new file mode 100644
index 0000000..41abb3f
--- /dev/null
+++ b/docs/manual/src/docbkx/images/smx4-start.gif
Binary files differ
diff --git a/docs/manual/src/docbkx/images/smx4-start.jpg b/docs/manual/src/docbkx/images/smx4-start.jpg
new file mode 100644
index 0000000..92d9de0
--- /dev/null
+++ b/docs/manual/src/docbkx/images/smx4-start.jpg
Binary files differ
diff --git a/docs/manual/src/docbkx/index.xml b/docs/manual/src/docbkx/index.xml
new file mode 100644
index 0000000..0830e46
--- /dev/null
+++ b/docs/manual/src/docbkx/index.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE book [
+ <!ENTITY version "4.2">
+]>
+<book id="book" label="Apache ServiceMix Manual Guide" status="draft" lang="en"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+
+ <title>Apache ServiceMix &version; Manual Guide</title>
+
+ <bookinfo>
+ <authorgroup>
+ <author>
+ <firstname>Guillaume</firstname>
+ <surname>Nodet</surname>
+ <email>gnodet@apache.org</email>
+ </author>
+ <author>
+ <firstname>Gert</firstname>
+ <surname>Vanthienen</surname>
+ <email>gertv@apache.org</email>
+ </author>
+ <author>
+ <firstname>Lars</firstname>
+ <surname>Heinemann</surname>
+ <email>lhein@apache.org</email>
+ </author>
+ <author>
+ <firstname>Jean-Baptiste</firstname>
+ <surname>Onofre</surname>
+ <email>jbonofre@apache.org</email>
+ </author>
+ <author>
+ <firstname>Bruce</firstname>
+ <surname>Snyder</surname>
+ <email>bsnyder@apache.org</email>
+ </author>
+ <author>
+ <firstname>Charles</firstname>
+ <surname>Moulliard</surname>
+ <email>cmoulliard@apache.org</email>
+ </author>
+ </authorgroup>
+ <copyright>
+ <year>2010</year>
+ <holder>Apache Software Foundation</holder>
+ </copyright>
+ <date>2010-04-28</date>
+ <revhistory>
+ <revision>
+ <revnumber>001</revnumber>
+ <date>2009-07-19</date>
+ <authorinitials>jbonofre</authorinitials>
+ <revremark>Initial revision</revremark>
+ </revision>
+ <revision>
+ <revnumber>002</revnumber>
+ <date>2010-02-02</date>
+ <authorinitials>cmoulliard</authorinitials>
+ <revremark>Update table of content, add directory for images</revremark>
+ </revision>
+ <revision>
+ <revnumber>003</revnumber>
+ <date>2010-04-28</date>
+ <authorinitials>cmoulliard</authorinitials>
+ <revremark>Split structure in several documents, add section numbering</revremark>
+ </revision>
+ </revhistory>
+ <corpname>Apache Software Foundation</corpname>
+ </bookinfo>
+
+ <toc />
+
+ <!-- Chapter on What is ServiceMix 4 -->
+ <xi:include href="whatissmx4.xml"/>
+
+ <!-- Chapter on installation and build -->
+ <xi:include href="installation.xml"/>
+
+ <!-- Chapter on clustering and high-availability -->
+ <xi:include href="clustering.xml"/>
+
+ <!-- Chapter on ServiceMix migration 3 to 4 -->
+ <xi:include href="migrate.xml"/>
+
+</book>
\ No newline at end of file
diff --git a/docs/manual/src/docbkx/installation.xml b/docs/manual/src/docbkx/installation.xml
new file mode 100644
index 0000000..d841ca0
--- /dev/null
+++ b/docs/manual/src/docbkx/installation.xml
@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!DOCTYPE chapter [
+<!ENTITY version "4.2">
+]>
+<chapter id="installation"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>Installation and build</title>
+ <figure>
+ <title>Figure 1 : Launch ServiceMix 4</title>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/smx4-start.gif" format="gif"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/smx4-start.gif" format="gif" width="18cm" depth="9cm"/>
+ </imageobject>
+ <textobject>
+ <phrase>Figure 1 : Launch ServiceMix 4</phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+
+ <section id="requirement">
+ <title>
+ Installation Requirements
+ </title>
+ <section id="hardware">
+ <title>
+ Hardware
+ </title>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ 100 MB of disk space for the ServiceMix &version; binary distribution.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
+ <section id="OS">
+ <title>
+ Operating Systems
+ </title>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis>
+ Microsoft Windows
+ </emphasis>
+ : XP SP2, 2000, 2003, Vista, 7
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ Unix
+ </emphasis>
+ : any Unix/Linux platform that supports Java.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
+ <section id="environment">
+ <title>
+ Environment
+ </title>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Java Developer Kit (JDK) 1.5.x (Java 5) for both deployment and compiling.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
+ <section id="download">
+ <title>
+ Get Apache ServiceMix &version;
+ </title>
+ <para>
+ You can download Apache ServiceMix &version; here:
+ <ulink>
+ http://servicemix.apache.org/download.html
+ </ulink>
+ .
+ </para>
+ <para>
+ Apache ServiceMix is provided in two formats:
+ <itemizedlist>
+ <listitem>
+ <para>
+ tarball for Unix platform
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ zip for Windows platform
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
+ </section>
+
+ <section id="install_standalone">
+ <title>
+ Standalone Binary Distribution Installation Procedure
+ </title>
+ <section id="uncompress">
+ <title>
+ Uncompress
+ </title>
+ <para>
+ Frist you need to uncompress the downloaded archive (tarball or zip) in the directory of your choice (where you have write permissions).
+ Define the SERVICEMIX_HOME variable:
+ <example>
+ <title>
+ Windows
+ </title>
+ <programlisting>
+ > set SERVICEMIX_HOME=C:\apache-servicemix-&version;
+ </programlisting>
+ </example>
+ <example>
+ <title>
+ Linux/Unix
+ </title>
+ <programlisting>
+ $ export SERVICEMIX_HOME=/apache-servicemix-&version;
+ </programlisting>
+ </example>
+ </para>
+ </section>
+ <section id="start">
+ <title>
+ Starting ServiceMix
+ </title>
+ <example>
+ <title>
+ Windows
+ </title>
+ <programlisting>
+ > cd %SERVICEMIX_HOME%
+ > .\bin\servicemix
+ </programlisting>
+ </example>
+ <example>
+ <title>
+ Linux/Unix
+ </title>
+ <programlisting>
+ $ cd $SERVICEMIX_HOME
+ $ ./bin/servicemix
+ </programlisting>
+ </example>
+ </section>
+ <section id="stop">
+ <title>
+ Stopping ServiceMix
+ </title>
+ <para>
+ For both Windows and Unix installations, terminate ServiceMix by typing "CTRL-C" on the command line where ServiceMix is running. ServiceMix uses the Java shutdown hook to cleanly shut down the container.
+ </para>
+ </section>
+ </section>
+
+ <section id="install_embedded">
+ <title>
+ ServiceMix Into A JEE Application Server Installation Procedure
+ </title>
+
+ </section>
+
+ <section id="configuration">
+ <title>
+ ServiceMix Configuration
+ </title>
+ <para>
+ This section contains description of main ServiceMix directories and files :
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis>
+ activemq-data
+ </emphasis>
+ - this directory is created by the ServiceMix at startup time. It contains the messages and transactions repository of the embedded Apache ActiveMQ.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ bin/servicemix
+ </emphasis>
+ - contains the main startup script of Apache ServiceMix.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/activemq.xml
+ </emphasis>
+ - contains the embedded Apache ActiveMQ configuration. This file shouldn't be modified as it's managed by internal ServiceMix processes.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/components.properties
+ </emphasis>
+ - contains the tuning of embedded JBI components. See the tuning section for more informations.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/servicemix.conf
+ </emphasis>
+ - contains the ServiceMix launcher classloading definition. This file shouldn't be modified.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/servicemix.properties
+ </emphasis>
+ - it's the main ServiceMix configuration file. It defines the port numbers used by the ServiceMix. You can change this file if one of the port number is already bound on your system.
+ By default, ServiceMix uses the following ports :
+ <itemizedlist>
+ <listitem>
+ <para>
+ 1099 (rmi.port) - the core RMI port used by the ServiceMix.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 61616 (activemq.port) - the embedded Apache ActiveMQ port.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/servicemix.xml
+ </emphasis>
+ - contains the main ServiceMix Spring application context. This file mustn't be modified.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/groups.properties
+ </emphasis>
+ - contains ServiceMix JAAS security group definition. You can define group security to access to ServiceMix via JMX.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/jmx.xml
+ </emphasis>
+ - contains ServiceMix JMX layer application context. This file mustn't be modified.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/jndi.properties
+ </emphasis>
+ - contains the default ServiceMix JNDI definition. This file shouldn't be modified as it's managed by ServiceMix internal processes.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/keystore.jks
+ </emphasis>
+ - contains the security keys and certificates used by ServiceMix security layer. This file mustn't be modified.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/log4j.xml
+ </emphasis>
+ - contains ServiceMix logging definition. You can change this file to change the default log level of ServiceMix components. You can add new loggers if required.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/login.properties
+ </emphasis>
+ - contains ServiceMix JAAS security definition. This file mustn't be changed.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/security.xml
+ </emphasis>
+ - contains ServiceMix Security layer application context. This file mustn't be modified.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/tx.xml
+ </emphasis>
+ - contains ServiceMix Transaction layer application context. This file mustn't be modified.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/users-credentials.properties
+ </emphasis>
+ - contains ServiceMix JAAS security users and credentials (in case of external security module). You can define users allowed to administrate ServiceMix via JMX.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ conf/users-passwords.properties
+ </emphasis>
+ - contains basic ServiceMix JAAS seucrity users and passwords (internal). You can add users allowed to administrate ServiceMix via JMX.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ data/log/servicemix.log
+ </emphasis>
+ - this file is created by ServiceMix at startup time. It contains main ServiceMix log file.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ data
+ </emphasis>
+ - this directory is created by ServiceMix at startup time. It contains all required file (storage) required by ServiceMix internal components.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ extras
+ </emphasis>
+ - this directory contains extras JAR files required by JBI components deployed in ServiceMix. If you want to add JAR files in ServiceMix classloader, use
+ <command>
+ lib
+ </command>
+ directory.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ hotdeploy
+ </emphasis>
+ - this directory contains JBI components (services) automatically deployed by ServiceMix.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ lib
+ </emphasis>
+ - this directory contains all required JAR files for ServiceMix. You can add new JAR file in this directory if required.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
+
+ <section id="deploy">
+ <title>
+ Deploying components and services into ServiceMix
+ </title>
+ </section>
+
+ <section id="tuning">
+ <title>
+ Tuning ServiceMix
+ </title>
+ <para>
+ You can tune ServiceMix at three basic levels :
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis>
+ Underlying JVM
+ </emphasis>
+ - ServiceMix uses an underlying JVM to run. By default, the JVM configuration is set to 512MB of maximum memory usage (that is enough for most of usage). Anyway if you encounter OutOfMemory problem and bad performances, you can define JVM parameters.
+ To do it, create a
+ <command>
+ conf/servicemix.rc
+ </command>
+ file. In this file, you can define JAVA_MIN_MEM and JAVA_MAX_MEM variables.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ Core Engine Tuning
+ </emphasis>
+ - in the
+ <command>
+ conf/servicemix.properties
+ </command>
+ file, you can see three properties :
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis>
+ smx.corePoolSize
+ </emphasis>
+ - define the startup number of ServiceMix threads. By default, 16 threads are started.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ smx.maximumPoolSize
+ </emphasis>
+ - define the maximum number of ServiceMix threads. If you see some bottlenecks around thread waits, you can increase this value. By default, 32 threads maximum are allowed.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ smx.queueSize
+ </emphasis>
+ - define the maximum of messages store in the embedded Apache ActiveMQ. If you see some bottlenecks around message waits, you can increase this value. By default, ServiceMix can store 256 messages.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis>
+ Components Tuning
+ </emphasis>
+ - You can tune ServiceMix embedded JBI components using the
+ <command>
+ conf/components.properties
+ </command>
+ .
+ By default, this file contains the basic tuning for the HTTP components.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </section>
+</chapter>
diff --git a/docs/manual/src/docbkx/migrate.xml b/docs/manual/src/docbkx/migrate.xml
new file mode 100644
index 0000000..3887fb9
--- /dev/null
+++ b/docs/manual/src/docbkx/migrate.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<chapter id="migrate"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>Migrate from ServiceMix3 to ServiceMix 4</title>
+ <para>TODO</para>
+</chapter>
diff --git a/docs/manual/src/docbkx/whatissmx4.xml b/docs/manual/src/docbkx/whatissmx4.xml
new file mode 100644
index 0000000..5e4127c
--- /dev/null
+++ b/docs/manual/src/docbkx/whatissmx4.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<chapter id="whatissmx4"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>What is ServiceMix 4 ?</title>
+
+ <para>Apache ServiceMix is an open source ESB (Enterprise Service Bus) that
+ combines the functionality of a Service Oriented Architecture (SOA) and the
+ modularity. The adoption of a Service Bus allows to decouple the applicatons
+ together and reduce dependencies. Messages are used to wired the
+ applications (=services) and/or connectors to exchange information using
+ different protocols or communications mode like FTP, HTTP, WebServices,
+ ...
+ </para>
+
+ <para>This new version of Apache ServiceMix is more than an evolution of the
+ previous as the kernel of the platform has been completety rewritten and is designed
+ top of the OSGI specification. Using OSGI framework brings a new important feature
+ for SOA development : modularity. That means that we can handle classloading and application
+ lifecycle differently between the components.
+ </para>
+
+ <para>ServiceMix is lightweight and easily embeddable, has integrated Spring
+ support and can be run at the edge of the network (inside a client or
+ server), as a standalone ESB provider or as a service within another ESB.
+ You can use ServiceMix in Java SE or Java EE application server.
+ </para>
+
+ <!-- Section - level 1 - Platform presentation -->
+ <xi:include href="whatissmx4/platform_presentation.xml" />
+
+ <!-- Section - level 1 - Osgi for the dummies -->
+ <xi:include href="whatissmx4/osgi_for_dummies.xml" />
+
+ <!-- Section - level 1 - Kernel of Servicemix -->
+ <xi:include href="whatissmx4/kernel_servicemix.xml" />
+
+ <!-- Section - level 1 - JBI container and integration with OSGI -->
+ <xi:include href="whatissmx4/jbi_container_integration_osgi.xml" />
+
+ <!-- Section - level 1 - Messaging bus -->
+ <xi:include href="whatissmx4/messaging_bus.xml" />
+
+ <!-- Section - level 1 - Services proposed -->
+ <xi:include href="whatissmx4/services_proposed.xml" />
+</chapter>
diff --git a/docs/manual/src/docbkx/whatissmx4/jbi_container_integration_osgi.xml b/docs/manual/src/docbkx/whatissmx4/jbi_container_integration_osgi.xml
new file mode 100644
index 0000000..0b1ccdd
--- /dev/null
+++ b/docs/manual/src/docbkx/whatissmx4/jbi_container_integration_osgi.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<section id="jbi_container_integration_osgi"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>JBI Container & Integration with OSGI</title>
+ <para>TODO</para>
+</section>
diff --git a/docs/manual/src/docbkx/whatissmx4/kernel_servicemix.xml b/docs/manual/src/docbkx/whatissmx4/kernel_servicemix.xml
new file mode 100644
index 0000000..8691e26
--- /dev/null
+++ b/docs/manual/src/docbkx/whatissmx4/kernel_servicemix.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<section id="kernel_servicemix"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>Kernel of Servicemix</title>
+ <para>TODO</para>
+</section>
diff --git a/docs/manual/src/docbkx/whatissmx4/messaging_bus.xml b/docs/manual/src/docbkx/whatissmx4/messaging_bus.xml
new file mode 100644
index 0000000..0945b18
--- /dev/null
+++ b/docs/manual/src/docbkx/whatissmx4/messaging_bus.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<section id="messaging_bus"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>Messaging bus</title>
+ <para>TODO</para>
+
+ <section id="Normalized Message Router">
+ <title>Normalized Message Router</title>
+ <para>TODO</para>
+ </section>
+
+ <section id="Camel">
+ <title>Camel</title>
+ <para>TODO</para>
+ </section>
+</section>
diff --git a/docs/manual/src/docbkx/whatissmx4/osgi_for_dummies.xml b/docs/manual/src/docbkx/whatissmx4/osgi_for_dummies.xml
new file mode 100644
index 0000000..bac3f16
--- /dev/null
+++ b/docs/manual/src/docbkx/whatissmx4/osgi_for_dummies.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<section id="osgi_for_dummies"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>Osgi for the dummies</title>
+ <para>TODO</para>
+</section>
diff --git a/docs/manual/src/docbkx/whatissmx4/platform_presentation.xml b/docs/manual/src/docbkx/whatissmx4/platform_presentation.xml
new file mode 100644
index 0000000..28c1977
--- /dev/null
+++ b/docs/manual/src/docbkx/whatissmx4/platform_presentation.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<section id="platformpresentation"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>Platform presentation</title>
+
+ <para>
+ Apache ServiceMix is an distributed ESB built from the ground up on the Java Business Integration (JBI) specification JSR 208 and released
+ under the Apache license. The goal of JBI is to allow components and services to be integrated in a vendor independent way, allowing users
+ and vendors to plug and play.
+ </para>
+
+ <para>ServiceMix uses ActiveMQ to provide remoting, clustering, reliability
+ and distributed failover.</para>
+
+ <para>ServiceMix is completely integrated into Apache Geronimo, which allows
+ you to deploy JBI components and services directly into Geronimo. ServiceMix
+ is being JBI certified as part of the Geronimo project.
+ </para>
+
+ <para>ServiceMix can be embedded into a JEE application server such as
+ JBoss, Oracle Weblogic or IBM Websphere.
+ </para>
+
+ <para>ServiceMix includes a complete JBI container supporting all parts of
+ the JBI specification including: <itemizedlist>
+ <listitem>
+ <para>NMR (Normalized Message Router)</para>
+ </listitem>
+
+ <listitem>
+ <para>JBI Management MBeans</para>
+ </listitem>
+
+ <listitem>
+ <para>full support for the JBI deployment units with hot-deployment of
+ JBI components.</para>
+ </listitem>
+ </itemizedlist></para>
+
+ <para>ServiceMix also provides a simple to use client API for working with
+ JBI components and services.</para>
+
+ <para>ServiceMix includes many JBI components including HTTP, JMX, CXF,
+ BPEL, etc.
+ </para>
+
+</section>
diff --git a/docs/manual/src/docbkx/whatissmx4/services_proposed.xml b/docs/manual/src/docbkx/whatissmx4/services_proposed.xml
new file mode 100644
index 0000000..0259571
--- /dev/null
+++ b/docs/manual/src/docbkx/whatissmx4/services_proposed.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<section id="services_proposed"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://docbook.org/ns/docbook
+ http://www.docbook.org/xml/5.0/xsd/docbook.xsd"
+ version="5.0" xml:lang="en">
+ <title>Services proposed</title>
+ <para>TODO</para>
+
+ <section id="Queuing engine : Apache ActiveMq">
+ <title>Queuing engine : Apache ActiveMq</title>
+ <para>TODO</para>
+ </section>
+
+ <section id="Transaction : Geronimo Transaction Manager">
+ <title>Transaction : Geronimo Transaction Manager</title>
+ <para>TODO</para>
+ </section>
+
+ <section id="Routing and Mediation : Apache Camel">
+ <title>Routing and Mediation : Apache Camel</title>
+ <para>TODO</para>
+ </section>
+
+ <section id="Web Services : Apache CXF">
+ <title>Web Services : Apache CXF</title>
+ <para>TODO</para>
+ </section>
+
+ <section id="Web Container">
+ <title>Web Container</title>
+ <para>TODO</para>
+ </section>
+
+ <section id="SOA platform">
+ <title>SOA platform</title>
+ <para>TODO</para>
+
+ <section id="Spring DM container">
+ <title>Spring DM container</title>
+ <para>TODO</para>
+ </section>
+
+ <section id="Blueprint OSGI container">
+ <title>Blueprint OSGI container</title>
+ <para>TODO</para>
+ </section>
+
+ <section id="EJB container">
+ <title>EJB Container</title>
+ <para>TODO</para>
+ </section>
+
+ </section>
+</section>
diff --git a/docs/pom.xml b/docs/pom.xml
index 3d309d0..60f1786 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.docs</groupId>
<artifactId>parent</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.3-SNAPSHOT</version>
</parent>
<artifactId>docs</artifactId>
@@ -32,12 +32,15 @@
<description>Apache ServiceMix Documentation</description>
<modules>
- <module>quickstart</module>
+ <module>manual</module>
<module>jbi</module>
</modules>
<properties>
<docbkx.start.page>index.xml</docbkx.start.page>
+
+ <!-- toolchain versions -->
+ <docs-maven-plugin.version>0.1-SNAPSHOT</docs-maven-plugin.version>
</properties>
<build>
@@ -155,9 +158,9 @@
</plugin>
<plugin>
- <groupId>org.apache.servicemix.docs</groupId>
- <artifactId>tools</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>docs-maven-plugin</artifactId>
+ <version>${docs-maven-plugin.version}</version>
<executions>
<execution>
<id>configure-snippet-handler</id>
diff --git a/docs/quickstart/src/docbkx/index.xml b/docs/quickstart/src/docbkx/index.xml
deleted file mode 100644
index 7e8b8aa..0000000
--- a/docs/quickstart/src/docbkx/index.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
- <bookinfo>
- <title>Apache ServiceMix</title>
- <subtitle>Quickstart Guide</subtitle>
- <releaseinfo>&version;</releaseinfo>
-
- <authorgroup>
- <corpauthor>Apache ServiceMix Community</corpauthor>
- </authorgroup>
-
- <legalnotice>
- <para>Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership. The
- ASF licenses this file to You under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the
- License. You may obtain a copy of the License at</para>
-
- <para>http://www.apache.org/licenses/LICENSE-2.0</para>
-
- <para>Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an "AS IS"
- BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing permissions
- and limitations under the License.</para>
- </legalnotice>
- </bookinfo>
-
- <toc></toc>
-
- <xi:include href="installation.xml" parse="xml" />
- <xi:include href="start.xml" parse="xml" />
-
-</book>
\ No newline at end of file
diff --git a/docs/quickstart/src/docbkx/installation.xml b/docs/quickstart/src/docbkx/installation.xml
deleted file mode 100644
index ea2b9c6..0000000
--- a/docs/quickstart/src/docbkx/installation.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
-<chapter id="installation">
-<title>Installing ServiceMix</title>
-<para>Install ServiceMix and start it a first time.</para>
-
-<section id="prereqs">
- <title>System requirements</title>
- <para>
- In order to function properly, Apache ServiceMix requires:
- <itemizedlist>
- <listitem>Java 5 JRE or higher</listitem>
- <listitem>At least 200 MB free disk space</listitem>
- </itemizedlist>
- </para>
-</section>
-
-<section>
- <title>Installation</title>
- <para>
- Download the appropriate archive for your platform:
- <itemizedlist>
- <listitem>apache-servicemix-&version;.tar.gz for Linux, Unix and Mac OS X</listitem>
- <listitem>apache-servicemix-&version;.zip for Windows</listitem>
- </itemizedlist>
- </para>
- <para>
- Extract the archive on your hard disk. Afterwards, you'll find this directory structure
-<literallayout>+- ant
-+- bin
-+- deploy
-+- etc
-+- examples
-+- lib
-\- system
-</literallayout>
- </para>
-</section>
-
-</chapter>
\ No newline at end of file
diff --git a/docs/quickstart/src/docbkx/start.xml b/docs/quickstart/src/docbkx/start.xml
deleted file mode 100644
index 52030d0..0000000
--- a/docs/quickstart/src/docbkx/start.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" >
-<chapter>
-<title>Starting ServiceMix</title>
-<chapterinfo>
- <abstract>How to start ServiceMix</abstract>
-</chapterinfo>
-
-<section>
- <title>Start ServiceMix on Windows</title>
- <para>
- In order to function properly, Apache ServiceMix requires:
- <itemizedlist>
- <listitem>Java 5 JRE or higher</listitem>
- <listitem>At least 200 MB free disk space</listitem>
- </itemizedlist>
- </para>
-</section>
-
-</chapter>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bd1a09d..5585b46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,27 +16,30 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>7</version>
+ </parent>
<groupId>org.apache.servicemix.docs</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.3-SNAPSHOT</version>
<name>Apache ServiceMix (Documentation)</name>
<description>The ServiceMix reference documentation</description>
<properties>
- <components.version>2010.01-SNAPSHOT</components.version>
- <servicemix-version>4.2.0-SNAPSHOT</servicemix-version>
+ <components.version>2010.02-SNAPSHOT</components.version>
+ <servicemix-version>4.3-SNAPSHOT</servicemix-version>
</properties>
<modules>
<module>common</module>
<module>docs</module>
- <module>tools</module>
</modules>
<build>
diff --git a/tools/pom.xml b/tools/pom.xml
deleted file mode 100644
index 8d34688..0000000
--- a/tools/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>parent</artifactId>
- <groupId>org.apache.servicemix.docs</groupId>
- <version>4.2.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
-
- <artifactId>tools</artifactId>
- <packaging>maven-plugin</packaging>
- <name>Apache Servicemix :: Tooling for documentation</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/tools/src/main/java/org/apache/servicemix/docs/ConfluenceToDocbookMojo.java b/tools/src/main/java/org/apache/servicemix/docs/ConfluenceToDocbookMojo.java
deleted file mode 100644
index 1209556..0000000
--- a/tools/src/main/java/org/apache/servicemix/docs/ConfluenceToDocbookMojo.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLStreamHandler;
-import java.net.URLStreamHandlerFactory;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.servicemix.docs.confluence.ConfluenceConverter;
-import org.apache.servicemix.docs.snippet.SnippetHandler;
-
-/**
- * Convert pages in Confluence wiki markup to Docbook syntax
- *
- * @goal confluence-to-docbook
- * @phase generate-resources
- */
-public class ConfluenceToDocbookMojo extends AbstractMojo {
-
- /**
- * Location of the snippet cache
- * @parameter default-value="${basedir}/src/confluence"
- */
- protected File input;
-
- /**
- * Output directory for the Docbook sources
- * @parameter default-value="${project.build.directory}/docbkx/sources"
- */
- protected File output;
-
- public void execute() throws MojoExecutionException {
- if (!output.exists()) {
- output.mkdirs();
- }
- if (input.exists() && input.isDirectory()) {
- for (File file : input.listFiles()) {
- getLog().info("Creating DocBook from " + file.getAbsolutePath());
- FileWriter writer = null;
- try {
- writer = new FileWriter(new File(output, file.getName() + ".xml"));
-
- ConfluenceConverter converter =
- new ConfluenceConverter(new FileReader(file), writer);
-
- converter.convert();
- } catch (IOException e) {
- throw new MojoExecutionException("Unable to convert " + file, e);
- } finally {
- if (writer != null) {
- try {
- writer.close();
- } catch (IOException e) {
- // ignore this
- }
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tools/src/main/java/org/apache/servicemix/docs/SnippetMojo.java b/tools/src/main/java/org/apache/servicemix/docs/SnippetMojo.java
deleted file mode 100644
index 841ae7c..0000000
--- a/tools/src/main/java/org/apache/servicemix/docs/SnippetMojo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.servicemix.docs.snippet.SnippetHandler;
-
-import java.io.File;
-import java.net.URL;
-import java.net.URLStreamHandler;
-import java.net.URLStreamHandlerFactory;
-
-/**
- * Register a URL Handler to allow using snippet:// for pulling in code snippets from
- * the SVN repository
- *
- * @goal snippet
- * @phase initialize
- * @inheritByDefault false
- */
-public class SnippetMojo extends AbstractMojo {
-
- /**
- * Location of the snippet cache
- * @parameter default-value="${project.build.directory}/snippets"
- */
- protected File snippetCache;
-
- /**
- * @parameter @required
- */
- protected URL snippetBase;
-
- private static URLStreamHandlerFactory factory = null;
-
- public void execute() throws MojoExecutionException {
- if (factory == null) {
- getLog().info("Registering additional URL handlers (snippet://)");
-
- factory = new URLStreamHandlerFactory() {
-
- @Override
- public URLStreamHandler createURLStreamHandler(String protocol) {
- if (protocol.equals("snippet")) {
- return new SnippetHandler(SnippetMojo.this, snippetCache, snippetBase);
- }
- return null;
- }
- };
-
- URL.setURLStreamHandlerFactory(factory);
- } else {
- getLog().warn("Unable to register URL handlers more than once");
- }
- }
-}
diff --git a/tools/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceConverter.java b/tools/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceConverter.java
deleted file mode 100644
index b5f0548..0000000
--- a/tools/src/main/java/org/apache/servicemix/docs/confluence/ConfluenceConverter.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs.confluence;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Stack;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Represents a document in Confluence wiki markup
- */
-public class ConfluenceConverter {
-
- private static Pattern CHAPTER = Pattern.compile("^h1\\. .*");
- private static Pattern CHAPTER_OR_SECTION = Pattern.compile("^h[1-6]\\. .*");
-
- private BufferedReader reader;
- private PrintWriter writer;
-
- private int currentLevel = 0;
-
- private Stack<String> elements = new Stack<String>();
-
- public ConfluenceConverter(Reader reader, Writer writer) {
- if (reader instanceof BufferedReader) {
- this.reader = (BufferedReader) reader;
- } else {
- this.reader = new BufferedReader(reader);
- }
- if (writer instanceof PrintWriter) {
- this.writer = (PrintWriter) writer;
- } else {
- this.writer = new PrintWriter(writer);
- }
- }
-
- public void convert() throws IOException {
- String line = null;
-
- while ((line = reader.readLine()) != null) {
- if (CHAPTER_OR_SECTION.matcher(line).matches()) {
- writeChapterOrSection(line);
- } else if ("{code}".equals(line.trim())) {
- writeProgramListing();
- } else {
- writePara(line);
- }
- }
-
- // let's close everying that was opened
- closeElements();
-
- }
-
- private void writeProgramListing() throws IOException {
- writeText("<programlisting><![CDATA[");
-
- String line = null;
- while ((line = reader.readLine()) != null && !line.equals("{code}")) {
- writeText(line, "");
- }
-
- writeText("]]></programlisting>");
- }
-
- private void writePara(String line) {
- if (line.trim().length() == 0) {
- if (elements.contains("para")) {
- closeElement("para");
- }
- } else {
- if (!elements.peek().equals("para")) {
- openElement("para");
- }
- writeText(filter(line));
- }
- }
-
- private String filter(String line) {
- return line.replaceAll("[\\{]{2}", "<code>").replaceAll("[\\}]{2}", "</code>");
- }
-
- private void writeText(String text) {
- writeText(text, indent());
- }
-
- private void writeText(String text, String indent) {
- writer.printf("%s%s%n", indent, text);
- }
-
- private void writeChapterOrSection(String line) {
- int level = Integer.parseInt(line.substring(1, 2));
- while (currentLevel >= level) {
- closeElement("section");
- currentLevel--;
- }
- if (CHAPTER.matcher(line).matches()) {
- openElement("chapter");
- } else {
- openElement("section");
- }
- writeElement("title", line.substring(3).trim());
- currentLevel = level;
- }
-
- private void writeElement(String element, String value) {
- writer.printf("%s<%s>%s</%s>%n", indent(), element, value, element);
- }
-
- private void openElement(String element) {
- writer.printf("%s<%s>%n", indent(), element);
- elements.push(element);
- }
-
- private void closeElements() {
- while (!elements.isEmpty()) {
- closeElement(elements.peek());
- }
- }
-
- private void closeElement(String element) {
- String next = elements.pop();
- writer.printf("%s</%s>%n", indent(), next);
- if (!element.equals(next)) {
- // recursive call to close everything down to the required element
- closeElement(element);
- }
- }
-
- private String indent() {
- StringBuffer buffer = new StringBuffer();
- for (int i = 0 ; i < elements.size(); i++) {
- buffer.append(" ");
- }
- return buffer.toString();
- }
-}
diff --git a/tools/src/main/java/org/apache/servicemix/docs/snippet/SnippetHandler.java b/tools/src/main/java/org/apache/servicemix/docs/snippet/SnippetHandler.java
deleted file mode 100644
index f589034..0000000
--- a/tools/src/main/java/org/apache/servicemix/docs/snippet/SnippetHandler.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs.snippet;
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.maven.plugin.AbstractMojo;
-
-/**
- * URLStreamHandler implementation for handling snippet:// URL
- */
-public class SnippetHandler extends URLStreamHandler {
-
- private static final String PROTOCOL = "snippet";
- private static final String PREFIX = PROTOCOL + "://";
-
- private AbstractMojo mojo;
- private File cache;
- private URL base;
-
- public SnippetHandler(AbstractMojo mojo, File cache, URL base) {
- super();
- this.mojo = mojo;
- this.cache = cache;
- this.base = base;
- }
-
-
- @Override
- protected URLConnection openConnection(final URL url) throws IOException {
- if (!cache.exists()) {
- mojo.getLog().debug("Creating cache directory " + cache);
- cache.mkdirs();
- }
-
- final String name = getFileName(url);
-
- final File cached = new File(cache, name);
- if (!cached.exists()) {
- cache(name);
- } else {
- mojo.getLog().debug("Using cached file " + cached.getAbsolutePath() + " for " + url.toExternalForm());
- }
-
- return new URLConnection(url) {
-
- @Override
- public void connect() throws IOException {
- // graciously do nothing
- }
-
- @Override
- public InputStream getInputStream() {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- PrintWriter out = new PrintWriter(bos);
- out.println("<programlisting><![CDATA[");
-
- String id = getQuery(url, "id");
- try {
- BufferedReader in = new BufferedReader(new FileReader(cached));
- if (id == null) {
- copy(in, out);
- } else {
- copy(in, out, id);
- }
- } catch (IOException e) {
- out.println("missing snippet: " + url);
-
- // summary warning message and full detail debug logging
- mojo.getLog().warn("Unable to include snippet " + url.toExternalForm());
- mojo.getLog().debug("Unable to include snippet " + url.toExternalForm(), e);
- }
-
- out.println("]]></programlisting>");
- out.flush();
- out.close();
-
- return new ByteArrayInputStream(bos.toByteArray());
- }
- };
- }
-
- private static final String getQuery(URL url, String key) {
- return getQueryMap(url).get(key);
- }
-
- private static final Map<String, String> getQueryMap(URL url) {
- Map<String, String> query = new HashMap<String, String>();
-
- if (url.getQuery() != null) {
- for (String param : url.getQuery().split("&")) {
- String[] pair = param.split("=");
- query.put(pair[0], pair[1]);
- }
- }
-
- return query;
- }
-
- private String getFileName(URL url) {
- String result = url.toExternalForm().substring(PREFIX.length());
- if (url.getQuery() != null) {
- result = result.replace("?" + url.getQuery(), "");
- }
- return result;
- }
-
- private void cache(String name) throws IOException {
- URL source = getSourceUrl(name);
-
- File target = new File(cache, name);
-
- BufferedReader in = null;
- PrintWriter out = null;
- try {
- if (!target.getParentFile().isDirectory()) {
- target.getParentFile().mkdirs();
- }
-
- mojo.getLog().debug("Caching " + source.toExternalForm() + " in " + target.getAbsolutePath());
-
- in =new BufferedReader(
- new InputStreamReader(source.openConnection().getInputStream()));
- out = new PrintWriter(new FileWriter(target));
-
- copy(in, out);
- out.flush();
- } catch (IOException e) {
- // summary warning message and full detail debug message
- mojo.getLog().warn("Unable to cache data for " + name + " : " + e.getMessage());
- mojo.getLog().debug("Unable to cache data for " + name + " : " + e.getMessage(), e);
- } finally {
- if (in != null) {
- in.close();
- }
- if (out != null) {
- out.close();
- }
- }
-
- }
-
-
- private URL getSourceUrl(String name) throws MalformedURLException {
- URL source;
- if (base.toExternalForm().endsWith("/")) {
- source = new URL(base.toExternalForm() + name);
- } else {
- source = new URL(base.toExternalForm() + "/" + name);
- }
- return source;
- }
-
- private void copy(BufferedReader in, PrintWriter out) throws IOException {
-
- String inputLine;
-
- while ((inputLine = in.readLine()) != null) {
- out.println(inputLine);
- }
-
- }
-
- private void copy(BufferedReader in, PrintWriter out, String id) throws IOException {
- String line = in.readLine();
- boolean snippet = false;
-
- while (line != null) {
- if (snippet) {
- if (line.contains("END SNIPPET: " + id)) {
- break;
- } else {
- out.println(line);
- }
- } else {
- if (line.contains("START SNIPPET: " + id)) {
- snippet = true;
- }
- }
-
- line = in.readLine();
- }
-
- }
-}
diff --git a/tools/src/test/java/org/apache/servicemix/docs/SnippetMojoTest.java b/tools/src/test/java/org/apache/servicemix/docs/SnippetMojoTest.java
deleted file mode 100644
index dd00f95..0000000
--- a/tools/src/test/java/org/apache/servicemix/docs/SnippetMojoTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test cases for {@link org.apache.servicemix.docs.SnippetMojo} and {@link org.apache.servicemix.docs.snippet.SnippetHandler}
- */
-public class SnippetMojoTest {
-
- private static SnippetMojo mojo;
-
- @BeforeClass
- public static void setUp() throws MojoExecutionException, MalformedURLException {
- mojo = new SnippetMojo();
- mojo.snippetCache = new File("target/tests/snippets-" + System.currentTimeMillis());
- mojo.snippetBase = new File("src/test/resources").toURI().toURL();
- mojo.execute();
- }
-
- @Test
- public void getFullSource() throws IOException {
- URL url = new URL("snippet://Test.java");
- String content = read(url).trim();
-
- assertTrue(content.startsWith("<programlisting><![CDATA["));
- assertTrue(content.contains("public class Test {"));
- assertTrue(content.endsWith("]]></programlisting>"));
- }
-
- @Test
- public void getSnippetFromSource() throws IOException {
- URL url = new URL("snippet://Test.java?id=doSomething");
- String content = read(url).trim();
-
- assertTrue(content.startsWith("<programlisting><![CDATA["));
- assertFalse(content.contains("public class Test {"));
- assertTrue(content.contains("public void doSomething() {"));
- assertTrue(content.endsWith("]]></programlisting>"));
-
- assertFalse(content.contains("<!-- BEGIN SNIPPET"));
- assertFalse(content.contains("<!-- END SNIPPET"));
- }
-
- private String read(URL url) throws IOException {
- InputStream is = null;
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
- try {
- is = url.openStream();
- byte[] data = new byte[4096];
- int read = is.read(data);
- while (read > 0) {
- bos.write(data, 0, read);
- read = is.read(data);
- }
- bos.flush();
- bos.close();
- return new String(bos.toByteArray());
- } finally {
- if (is != null) {
- is.close();
- }
- }
- }
-}
diff --git a/tools/src/test/java/org/apache/servicemix/docs/confluence/ConfluenceDocumentTest.java b/tools/src/test/java/org/apache/servicemix/docs/confluence/ConfluenceDocumentTest.java
deleted file mode 100644
index 6b39d55..0000000
--- a/tools/src/test/java/org/apache/servicemix/docs/confluence/ConfluenceDocumentTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.docs.confluence;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.util.List;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-
-import static junit.framework.Assert.assertEquals;
-
-/**
- * Test cases for {@link ConfluenceConverter}
- */
-public class ConfluenceDocumentTest {
-
- @org.junit.Test
- public void generateChapterAndSections() throws Exception {
- assertDocBook("document1");
- }
-
- @org.junit.Test
- public void generateChapterSectionsAndParagraphs() throws Exception {
- assertDocBook("document2");
- }
-
- @org.junit.Test
- public void generateProgramListingBlock() throws Exception {
- assertDocBook("code-blocks");
- }
-
- private void assertDocBook(String name) throws IOException {
- StringWriter writer = new StringWriter();
-
- List<String> expected = IOUtils.readLines(getClass().getResourceAsStream(name + ".xml"));
-
- ConfluenceConverter document =
- new ConfluenceConverter(new InputStreamReader(getClass().getResourceAsStream(name + ".wiki")),
- writer);
-
- document.convert();
- writer.flush();
- writer.close();
-
- String[] results = writer.toString().split("\\r?\\n\\r?");
- int i = 0;
-
- for (String result : results) {
- System.out.println(result);
- if (result.trim().length() > 0) {
-
- assertEquals("Line " + (i +1) + " should match the expected DocBook XML output",
- expected.get(i).trim(), result.trim());
- i++;
- }
- }
- }
-}
diff --git a/tools/src/test/resources/Test.java b/tools/src/test/resources/Test.java
deleted file mode 100644
index 664e6e3..0000000
--- a/tools/src/test/resources/Test.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * A simple Test class
- */
-public class Test {
-
- // START SNIPPET: doSomething
- public void doSomething() {
- // does something very interesting
- }
- // END SNIPPET: doSomething
-
- public void doSomethingElse() {
- // does something else, even more interesting
- }
-
-}
\ No newline at end of file
diff --git a/tools/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.wiki b/tools/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.wiki
deleted file mode 100644
index 37830ed..0000000
--- a/tools/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.wiki
+++ /dev/null
@@ -1,11 +0,0 @@
-h1. Chapter
-
-h2. Section 1
-This section contains a piece of {{code text}}.
-
-{code}
-<?xml version="1.0"?>
-<hello>
- <world/>
-</hello>
-{code}
\ No newline at end of file
diff --git a/tools/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.xml b/tools/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.xml
deleted file mode 100644
index 8684e42..0000000
--- a/tools/src/test/resources/org/apache/servicemix/docs/confluence/code-blocks.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<chapter>
- <title>Chapter</title>
- <section>
- <title>Section 1</title>
- <para>
- This section contains a piece of <code>code text</code>.
- </para>
- <programlisting><![CDATA[
- <?xml version="1.0"?>
- <hello>
- <world/>
- </hello>
- ]]></programlisting>
- </section>
-</chapter>
\ No newline at end of file
diff --git a/tools/src/test/resources/org/apache/servicemix/docs/confluence/document1.wiki b/tools/src/test/resources/org/apache/servicemix/docs/confluence/document1.wiki
deleted file mode 100644
index c7245a9..0000000
--- a/tools/src/test/resources/org/apache/servicemix/docs/confluence/document1.wiki
+++ /dev/null
@@ -1,7 +0,0 @@
-h1. Chapter
-
-h2. Section 1
-
-h3. Section 1.1
-
-h2. Section 2
\ No newline at end of file
diff --git a/tools/src/test/resources/org/apache/servicemix/docs/confluence/document1.xml b/tools/src/test/resources/org/apache/servicemix/docs/confluence/document1.xml
deleted file mode 100644
index 670d844..0000000
--- a/tools/src/test/resources/org/apache/servicemix/docs/confluence/document1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<chapter>
- <title>Chapter</title>
- <section>
- <title>Section 1</title>
- <section>
- <title>Section 1.1</title>
- </section>
- </section>
- <section>
- <title>Section 2</title>
- </section>
-</chapter>
\ No newline at end of file
diff --git a/tools/src/test/resources/org/apache/servicemix/docs/confluence/document2.wiki b/tools/src/test/resources/org/apache/servicemix/docs/confluence/document2.wiki
deleted file mode 100644
index 976cf38..0000000
--- a/tools/src/test/resources/org/apache/servicemix/docs/confluence/document2.wiki
+++ /dev/null
@@ -1,9 +0,0 @@
-h1. Chapter
-
-h2. Section 1
-Paragraph 1 starts here...
-
-Paragraph 2 starts here...
-
-h3. Section 1.1
-And one more paragraph
\ No newline at end of file
diff --git a/tools/src/test/resources/org/apache/servicemix/docs/confluence/document2.xml b/tools/src/test/resources/org/apache/servicemix/docs/confluence/document2.xml
deleted file mode 100644
index 8de779c..0000000
--- a/tools/src/test/resources/org/apache/servicemix/docs/confluence/document2.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<chapter>
- <title>Chapter</title>
- <section>
- <title>Section 1</title>
- <para>
- Paragraph 1 starts here...
- </para>
- <para>
- Paragraph 2 starts here...
- </para>
- <section>
- <title>Section 1.1</title>
- <para>
- And one more paragraph
- </para>
- </section>
- </section>
-</chapter>
\ No newline at end of file
