You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/03/24 07:44:56 UTC
[1/3] camel git commit: Using JCR API 2.0 jar directly in Apache
Camel feature
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x e6cca31dd -> 1a2e92d4c
refs/heads/camel-2.15.x db0689c41 -> 4969ed91b
Using JCR API 2.0 jar directly in Apache Camel feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4969ed91
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4969ed91
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4969ed91
Branch: refs/heads/camel-2.15.x
Commit: 4969ed91b532da07b161962fa812f80c81ad46bf
Parents: db0689c
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Mar 24 14:41:16 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Mar 24 14:43:51 2015 +0800
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4969ed91/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index eccdb34..ad099ad 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -560,7 +560,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hbase/${hbase-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hbase/${project.version}</bundle>
<!-- the following bundles can be removed when osgi metadata is fixed in commons-configuration and hbase, to have resolution=:option on packages that are optional -->
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle>
@@ -609,7 +609,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hadoop-core/${hadoop-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hdfs/${project.version}</bundle>
<!-- the following bundles can be removed when osgi metadata is fixed in commons-configuration, to have resolution=:option on packages that are optional -->
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle>
@@ -741,7 +741,7 @@
<bundle>mvn:org.apache.camel/camel-jclouds/${project.version}</bundle>
</feature>
<feature name='camel-jcr' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jcr/${project.version}</bundle>
[2/3] camel git commit: CAMEL-8470 Several small fixes for
camel-linkedin
Posted by ni...@apache.org.
CAMEL-8470 Several small fixes for camel-linkedin
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/784580be
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/784580be
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/784580be
Branch: refs/heads/camel-2.14.x
Commit: 784580be59da926c96135548ea656e4d94757f1a
Parents: e6cca31
Author: Tomas Rohovsky <tr...@redhat.com>
Authored: Tue Mar 10 16:38:01 2015 +0100
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Mar 24 14:44:11 2015 +0800
----------------------------------------------------------------------
.../src/main/resources/linkedin-api-schema.xsd | 6 +++---
.../src/main/resources/linkedin-api-wadl.xml | 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/784580be/components/camel-linkedin/camel-linkedin-api/src/main/resources/linkedin-api-schema.xsd
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/camel-linkedin-api/src/main/resources/linkedin-api-schema.xsd b/components/camel-linkedin/camel-linkedin-api/src/main/resources/linkedin-api-schema.xsd
index a5796f9..aa85449 100644
--- a/components/camel-linkedin/camel-linkedin-api/src/main/resources/linkedin-api-schema.xsd
+++ b/components/camel-linkedin/camel-linkedin-api/src/main/resources/linkedin-api-schema.xsd
@@ -193,12 +193,12 @@
<xs:element ref="description"/>
<xs:element ref="relation-to-viewer"/>
<xs:element ref="counts-by-category"/>
- <xs:element ref="is-open-to-non-members"/>
+ <xs:element minOccurs="0" ref="is-open-to-non-members"/>
<xs:element name="category" type="GroupCategory"/>
<xs:element ref="site-group-url"/>
<xs:element ref="contact-email"/>
<xs:element ref="locale"/>
- <xs:element ref="allow-member-invites"/>
+ <xs:element minOccurs="0" ref="allow-member-invites"/>
<xs:element ref="small-logo-url"/>
<xs:element ref="large-logo-url"/>
<xs:element ref="posts"/>
@@ -2056,7 +2056,7 @@
<xs:sequence>
<xs:element ref="id"/>
<xs:element ref="timestamp"/>
- <xs:element ref="comment"/>
+ <xs:element ref="comment" type="xs:string"/>
<xs:element ref="content"/>
<xs:element ref="visibility"/>
<xs:element ref="source"/>
http://git-wip-us.apache.org/repos/asf/camel/blob/784580be/components/camel-linkedin/camel-linkedin-api/src/main/resources/linkedin-api-wadl.xml
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/camel-linkedin-api/src/main/resources/linkedin-api-wadl.xml b/components/camel-linkedin/camel-linkedin-api/src/main/resources/linkedin-api-wadl.xml
index c08df21..a1c092c 100644
--- a/components/camel-linkedin/camel-linkedin-api/src/main/resources/linkedin-api-wadl.xml
+++ b/components/camel-linkedin/camel-linkedin-api/src/main/resources/linkedin-api-wadl.xml
@@ -286,7 +286,6 @@
<wadl:param href="#start"/>
<wadl:param href="#count"/>
<wadl:param href="#order"/>
- <wadl:param href="#post-role"/>
<wadl:param href="#category"/>
<wadl:param href="#modified-since"/>
<wadl:param href="#fields-selector"/>
@@ -685,6 +684,9 @@
<wadl:param href="#company-id"/>
<wadl:representation mediaType="application/xml" element="tns:share"/>
</wadl:request>
+ <wadl:response>
+ <wadl:representation mediaType="application/xml" element="tns:update"/>
+ </wadl:response>
</wadl:method>
</wadl:resource>
[3/3] camel git commit: Using JCR API 2.0 jar directly in Apache
Camel feature
Posted by ni...@apache.org.
Using JCR API 2.0 jar directly in Apache Camel feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a2e92d4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a2e92d4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a2e92d4
Branch: refs/heads/camel-2.14.x
Commit: 1a2e92d4c84d8bf6bfdce0975604b33c0aac9279
Parents: 784580b
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Mar 24 14:41:16 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Mar 24 14:44:39 2015 +0800
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1a2e92d4/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index de3268c..e7a846e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -486,7 +486,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hbase/${hbase-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hbase/${project.version}</bundle>
<!-- the following bundles can be removed when osgi metadata is fixed in commons-configuration and hbase, to have resolution=:option on packages that are optional -->
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle>
@@ -535,7 +535,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hadoop-core/${hadoop-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hdfs/${project.version}</bundle>
<!-- the following bundles can be removed when osgi metadata is fixed in commons-configuration, to have resolution=:option on packages that are optional -->
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle>
@@ -657,7 +657,7 @@
<bundle>mvn:org.apache.camel/camel-jclouds/${project.version}</bundle>
</feature>
<feature name='camel-jcr' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jcr/${project.version}</bundle>