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

2017-03-18 Thread davsclaus 
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 
Authored: Fri Mar 17 19:22:30 2017 +0100
Committer: Claus Ibsen 
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 @@
 
 
   
+store-camel-schema-version-in-file
+initialize
+
+  
+
+
+
+
+
+
+
+
+
+
+  camel.schema.version = ${camel.schema.version}
+
+  
+
+
+  run
+
+  
+  
 generate-sources
 process-classes
 
   
 
-
 Copying code together for the XSD generation
 
 
@@ -315,21 +337,6 @@
 
   
 
-
-
-
-
-
-
-
-
-
-
-
-
-  camel.schema.version = ${camel.schema.version}
-
-
 Generating XSD schema
 
 
@@ -359,7 +366,7 @@
   run
 
   
-  
+  
   
 include-schemas
 prepare-package
@@ -381,12 +388,14 @@
   
 
   
+  
   
 org.codehaus.mojo
 properties-maven-plugin
 
   
-process-classes
+init-camel-schema-version-property-from-file
+initialize
 
   read-project-properties
 
@@ -398,6 +407,7 @@
   
 
   
+  
   
   
 org.codehaus.mojo

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

2017-03-18 Thread davsclaus 
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 
Authored: Fri Mar 17 19:22:30 2017 +0100
Committer: Claus Ibsen 
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 @@
 
 
   
+store-camel-schema-version-in-file
+initialize
+
+  
+
+
+
+
+
+
+
+
+
+
+  camel.schema.version = ${camel.schema.version}
+
+  
+
+
+  run
+
+  
+  
 generate-sources
 process-classes
 
   
 
-
 Copying code together for the XSD generation
 
 
@@ -309,21 +331,6 @@
 
   
 
-
-
-
-
-
-
-
-
-
-
-
-
-  camel.schema.version = ${camel.schema.version}
-
-
 Generating XSD schema
 
 
@@ -355,7 +362,7 @@
   run
 
   
-  
+  
   
 include-schemas
 prepare-package
@@ -377,12 +384,14 @@
   
 
   
+  
   
 org.codehaus.mojo
 properties-maven-plugin
 
   
-process-classes
+init-camel-schema-version-property-from-file
+initialize
 
   read-project-properties
 
@@ -394,6 +403,7 @@
   
 
   
+  
   
   
 org.codehaus.mojo

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

2017-03-18 Thread davsclaus 
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 
Authored: Fri Mar 17 16:34:28 2017 +0100
Committer: Claus Ibsen 
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{}|===