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/05/03 13:31:25 UTC
svn commit: r940421 - in /servicemix/documentation/trunk: ./ common/ docs/
docs/jbi/ docs/manual/ docs/manual/src/docbkx/ docs/quickstart/ tools/
Author: gertv
Date: Mon May 3 11:31:25 2010
New Revision: 940421
URL: http://svn.apache.org/viewvc?rev=940421&view=rev
Log:
Initial commit -- merging sandbox projects into a single project
Added:
servicemix/documentation/trunk/ (props changed)
- copied from r940407, servicemix/sandbox/gertv/documentation/trunk/
servicemix/documentation/trunk/docs/manual/ (props changed)
- copied from r940407, servicemix/sandbox/gertv/documentation/trunk/docs/quickstart/
servicemix/documentation/trunk/docs/manual/src/docbkx/
- copied from r940418, servicemix/sandbox/jbonofre/documentation/src/docbkx/
servicemix/documentation/trunk/docs/manual/src/docbkx/index.xml
- copied unchanged from r940418, servicemix/sandbox/jbonofre/documentation/src/docbkx/servicemix4-manual.xml
Removed:
servicemix/documentation/trunk/docs/manual/src/docbkx/servicemix4-manual.xml
servicemix/documentation/trunk/docs/quickstart/
servicemix/documentation/trunk/tools/
Modified:
servicemix/documentation/trunk/.gitignore
servicemix/documentation/trunk/common/ (props changed)
servicemix/documentation/trunk/common/pom.xml
servicemix/documentation/trunk/docs/ (props changed)
servicemix/documentation/trunk/docs/jbi/ (props changed)
servicemix/documentation/trunk/docs/jbi/pom.xml
servicemix/documentation/trunk/docs/manual/pom.xml
servicemix/documentation/trunk/docs/pom.xml
servicemix/documentation/trunk/pom.xml
Propchange: servicemix/documentation/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 3 11:31:25 2010
@@ -0,0 +1,5 @@
+target
+.settings
+.classpath
+.project
+*.i??
Modified: servicemix/documentation/trunk/.gitignore
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/.gitignore?rev=940421&r1=940407&r2=940421&view=diff
==============================================================================
--- servicemix/documentation/trunk/.gitignore (original)
+++ servicemix/documentation/trunk/.gitignore Mon May 3 11:31:25 2010
@@ -1 +1,5 @@
-target
\ No newline at end of file
+target
+.settings
+.classpath
+.project
+*.i??
\ No newline at end of file
Propchange: servicemix/documentation/trunk/common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 3 11:31:25 2010
@@ -0,0 +1,5 @@
+target
+.settings
+.classpath
+.project
+*.i??
Modified: servicemix/documentation/trunk/common/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/common/pom.xml?rev=940421&r1=940407&r2=940421&view=diff
==============================================================================
--- servicemix/documentation/trunk/common/pom.xml (original)
+++ servicemix/documentation/trunk/common/pom.xml Mon May 3 11:31:25 2010
@@ -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>
Propchange: servicemix/documentation/trunk/docs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 3 11:31:25 2010
@@ -0,0 +1,5 @@
+target
+.settings
+.classpath
+.project
+*.i??
Propchange: servicemix/documentation/trunk/docs/jbi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 3 11:31:25 2010
@@ -0,0 +1,5 @@
+target
+.settings
+.classpath
+.project
+*.i??
Modified: servicemix/documentation/trunk/docs/jbi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/docs/jbi/pom.xml?rev=940421&r1=940407&r2=940421&view=diff
==============================================================================
--- servicemix/documentation/trunk/docs/jbi/pom.xml (original)
+++ servicemix/documentation/trunk/docs/jbi/pom.xml Mon May 3 11:31:25 2010
@@ -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>
Propchange: servicemix/documentation/trunk/docs/manual/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 3 11:31:25 2010
@@ -0,0 +1,5 @@
+target
+.settings
+.classpath
+.project
+*.i??
Modified: servicemix/documentation/trunk/docs/manual/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/docs/manual/pom.xml?rev=940421&r1=940407&r2=940421&view=diff
==============================================================================
--- servicemix/documentation/trunk/docs/manual/pom.xml (original)
+++ servicemix/documentation/trunk/docs/manual/pom.xml Mon May 3 11:31:25 2010
@@ -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>
Modified: servicemix/documentation/trunk/docs/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/docs/pom.xml?rev=940421&r1=940407&r2=940421&view=diff
==============================================================================
--- servicemix/documentation/trunk/docs/pom.xml (original)
+++ servicemix/documentation/trunk/docs/pom.xml Mon May 3 11:31:25 2010
@@ -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>
Modified: servicemix/documentation/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/pom.xml?rev=940421&r1=940407&r2=940421&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Mon May 3 11:31:25 2010
@@ -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>