[1/3] camel git commit: Component docs - Adjust tables, lets try with description sooner

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/3] camel git commit: Component docs - Adjust tables, lets try with description sooner

davsclaus-2
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 49adc55b7 -> 21ea24d6d
  refs/heads/doc-table bb3764e39 -> 59fbe44de
  refs/heads/master 42c26f1d9 -> f1737ded8


Component docs - Adjust tables, lets try with description sooner


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59fbe44d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59fbe44d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59fbe44d

Branch: refs/heads/doc-table
Commit: 59fbe44dee94a5cc44e2c942b9f7861d1611866a
Parents: bb3764e
Author: Claus Ibsen <[hidden email]>
Authored: Fri Mar 17 16:34:28 2017 +0100
Committer: Claus Ibsen <[hidden email]>
Committed: Fri Mar 17 16:34:28 2017 +0100

----------------------------------------------------------------------
 .../src/main/resources/component-options.mvel           |  6 +++---
 .../src/main/resources/endpoint-options.mvel            | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/59fbe44d/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
index 26e9e91..bd0e92d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
@@ -5,9 +5,9 @@ The @{title} component supports @{componentOptions.size()} options which are lis
 @end{}
 
 @if{!componentOptions.isEmpty()}
-[width="100%",cols="2,6,1,1",options="header"]
+[width="100%",cols="2,^1,5,2",options="header"]
 |=======================================================================
-| Name | Description | Default | Type
-@foreach{row : componentOptions}| **@{row.getShortName(30)}** (@{row.shortGroup}) | @{row.description} | @{row.getShortDefaultValue(20)}  | @{row.getShortJavaType(25)}
+| Name | Default | Description | Type
+@foreach{row : componentOptions}| **@{row.getShortName(25)}** (@{row.shortGroup}) | @{row.getShortDefaultValue(18)} | @{row.description} | @{row.getShortJavaType(25)}
 @end{}|=======================================================================
 @end{}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/59fbe44d/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
index 84b24f7..bb743a8 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
@@ -6,16 +6,16 @@ with the following path and query parameters:
 
 #### Path Parameters (@{endpointPathOptions.size()} parameters):
 
-[width="100%",cols="2,6,1,1",options="header"]
+[width="100%",cols="2,^1,5,2",options="header"]
 |=======================================================================
-| Name | Description | Default | Type
-@foreach{row : endpointPathOptions}| **@{row.getShortName(30)}** | @{row.description} | @{row.getShortDefaultValue(20)} | @{row.getShortJavaType(25)}
+| Name | Default | Description | Type
+@foreach{row : endpointPathOptions}| **@{row.getShortName(25)}** | @{row.getShortDefaultValue(18)} | @{row.description} | @{row.getShortJavaType(25)}
 @end{}|=======================================================================
 
 #### Query Parameters (@{endpointOptions.size()} parameters):
 
-[width="100%",cols="2,6,1,1",options="header"]
+[width="100%",cols="2,^1,5,2",options="header"]
 |=======================================================================
-| Name | Description | Default | Type
-@foreach{row : endpointOptions}| **@{row.getShortName(30)}** (@{row.shortGroup}) | @{row.description} | @{row.getShortDefaultValue(20)} | @{row.getShortJavaType(25)}
+| Name | Default | Description | Type
+@foreach{row : endpointOptions}| **@{row.getShortName(25)}** (@{row.shortGroup}) | @{row.getShortDefaultValue(18)} | @{row.description} | @{row.getShortJavaType(25)}
 @end{}|=======================================================================

Reply | Threaded
Open this post in threaded view
|

[2/3] camel git commit: CAMEL-11009: Set the camel.schema.version property earlier

davsclaus-2
CAMEL-11009: Set the camel.schema.version property earlier


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1737ded
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1737ded
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1737ded

Branch: refs/heads/master
Commit: f1737ded87c0c6cf994f99f780f9c5c4018ef901
Parents: 42c26f1
Author: aldettinger <[hidden email]>
Authored: Fri Mar 17 19:22:30 2017 +0100
Committer: Claus Ibsen <[hidden email]>
Committed: Sat Mar 18 09:51:22 2017 +0100

----------------------------------------------------------------------
 components/camel-spring/pom.xml | 46 ++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f1737ded/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 386b8c3..e44e5bf 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -278,12 +278,34 @@
         </dependencies>
         <executions>
           <execution>
+            <id>store-camel-schema-version-in-file</id>
+            <phase>initialize</phase>
+            <configuration>
+              <target>
+                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
+                <property name="mv" value="${project.version}" />
+                <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
+                <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
+                <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
+                <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
+                <property name="camel.schema.version" value="${ov.p1a}${ov.p2a}" />
+                <mkdir dir="target" />
+                <echo file="target/camel.osgi.version.txt">
+                      camel.schema.version = ${camel.schema.version}
+                </echo>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
             <id>generate-sources</id>
             <phase>process-classes</phase>
             <configuration>
               <target>
                 <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" />
-
                 <echo>Copying code together for the XSD generation</echo>
                 <mkdir dir="${project.build.directory}/schema-src" />
                 <copy todir="${project.build.directory}/schema-src">
@@ -309,21 +331,6 @@
                     <include name="org/apache/camel/package-info.java" />
                   </fileset>
                 </copy>
-
-
-                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
-                <property name="mv" value="${project.version}" />
-                <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
-                <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
-                <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
-                <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
-                <property name="camel.schema.version" value="${ov.p1a}${ov.p2a}" />
-                <mkdir dir="target" />
-                <echo file="target/camel.osgi.version.txt">
-                      camel.schema.version = ${camel.schema.version}
-                </echo>
-
                 <echo>Generating XSD schema</echo>
                 <mkdir dir="${project.build.directory}/schema" />
                 <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
@@ -355,7 +362,7 @@
               <goal>run</goal>
             </goals>
           </execution>
-          <!-- after the eip-documentation-enricher we need to copy some shchema files -->
+          <!-- after the eip-documentation-enricher we need to copy some schema files -->
           <execution>
             <id>include-schemas</id>
             <phase>prepare-package</phase>
@@ -377,12 +384,14 @@
           </execution>
         </executions>
       </plugin>
+      
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>properties-maven-plugin</artifactId>
         <executions>
           <execution>
-            <phase>process-classes</phase>
+            <id>init-camel-schema-version-property-from-file</id>
+            <phase>initialize</phase>
             <goals>
               <goal>read-project-properties</goal>
             </goals>
@@ -394,6 +403,7 @@
           </execution>
         </executions>
       </plugin>
+      
       <!-- add the sources from camel-core-osgi and camel-core-xml as source code in the camel-spring-sources.jar -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Reply | Threaded
Open this post in threaded view
|

[3/3] camel git commit: CAMEL-11009: Set the camel.schema.version property earlier

davsclaus-2
In reply to this post by davsclaus-2
CAMEL-11009: Set the camel.schema.version property earlier


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/21ea24d6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/21ea24d6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/21ea24d6

Branch: refs/heads/camel-2.18.x
Commit: 21ea24d6d4670f25dcd19f9c9f2aa8da7a3d6083
Parents: 49adc55
Author: aldettinger <[hidden email]>
Authored: Fri Mar 17 19:22:30 2017 +0100
Committer: Claus Ibsen <[hidden email]>
Committed: Sat Mar 18 09:57:20 2017 +0100

----------------------------------------------------------------------
 components/camel-spring/pom.xml | 46 ++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/21ea24d6/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 57727db..e790c65 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -284,12 +284,34 @@
         </dependencies>
         <executions>
           <execution>
+            <id>store-camel-schema-version-in-file</id>
+            <phase>initialize</phase>
+            <configuration>
+              <target>
+                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
+                <property name="mv" value="${project.version}" />
+                <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
+                <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
+                <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
+                <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
+                <property name="camel.schema.version" value="${ov.p1a}${ov.p2a}" />
+                <mkdir dir="target" />
+                <echo file="target/camel.osgi.version.txt">
+                      camel.schema.version = ${camel.schema.version}
+                </echo>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
             <id>generate-sources</id>
             <phase>process-classes</phase>
             <configuration>
               <target>
                 <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" />
-
                 <echo>Copying code together for the XSD generation</echo>
                 <mkdir dir="${project.build.directory}/schema-src" />
                 <copy todir="${project.build.directory}/schema-src">
@@ -315,21 +337,6 @@
                     <include name="org/apache/camel/package-info.java" />
                   </fileset>
                 </copy>
-
-
-                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
-                <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
-                <property name="mv" value="${project.version}" />
-                <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
-                <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
-                <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
-                <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
-                <property name="camel.schema.version" value="${ov.p1a}${ov.p2a}" />
-                <mkdir dir="target" />
-                <echo file="target/camel.osgi.version.txt">
-                      camel.schema.version = ${camel.schema.version}
-                </echo>
-
                 <echo>Generating XSD schema</echo>
                 <mkdir dir="${project.build.directory}/schema" />
                 <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
@@ -359,7 +366,7 @@
               <goal>run</goal>
             </goals>
           </execution>
-          <!-- after the eip-documentation-enricher we need to copy some shchema files -->
+          <!-- after the eip-documentation-enricher we need to copy some schema files -->
           <execution>
             <id>include-schemas</id>
             <phase>prepare-package</phase>
@@ -381,12 +388,14 @@
           </execution>
         </executions>
       </plugin>
+      
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>properties-maven-plugin</artifactId>
         <executions>
           <execution>
-            <phase>process-classes</phase>
+            <id>init-camel-schema-version-property-from-file</id>
+            <phase>initialize</phase>
             <goals>
               <goal>read-project-properties</goal>
             </goals>
@@ -398,6 +407,7 @@
           </execution>
         </executions>
       </plugin>
+      
       <!-- add the sources from camel-core-osgi and camel-core-xml as source code in the camel-spring-sources.jar -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>