git commit: search all bundles in the bundleContext for the OSGi version of findComponents()
Updated Branches:
refs/heads/master 5e1a3a3ea - 3553b95ad
search all bundles in the bundleContext for the OSGi version of findComponents()
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3553b95a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3553b95a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3553b95a
Branch: refs/heads/master
Commit: 3553b95ad66ff5240725de6479ff66292605ddcb
Parents: 5e1a3a3
Author: James Strachan james.strac...@gmail.com
Authored: Sat Jun 8 08:11:44 2013 +0200
Committer: James Strachan james.strac...@gmail.com
Committed: Sat Jun 8 08:11:44 2013 +0200
--
.../camel/core/osgi/OsgiDefaultCamelContext.java | 13 ++---
1 files changed, 10 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3553b95a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
--
diff --git
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
index 9f7b0b2..1a7b472 100644
---
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
+++
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
@@ -21,6 +21,8 @@ import java.net.URL;
import java.util.Enumeration;
import java.util.Map;
import java.util.Properties;
+import java.util.SortedMap;
+import java.util.TreeMap;
import org.apache.camel.TypeConverter;
import org.apache.camel.core.osgi.utils.BundleContextUtils;
@@ -48,9 +50,14 @@ public class OsgiDefaultCamelContext extends
DefaultCamelContext {
}
public MapString, Properties findComponents() throws
LoadPropertiesException, IOException {
-Bundle bundle = bundleContext.getBundle();
-EnumerationURL iter =
bundle.getResources(CamelContextHelper.COMPONENT_DESCRIPTOR);
-return CamelContextHelper.findComponents(this, iter);
+SortedMapString, Properties answer = new TreeMapString,
Properties();
+Bundle[] bundles = bundleContext.getBundles();
+for (Bundle bundle : bundles) {
+EnumerationURL iter =
bundle.getResources(CamelContextHelper.COMPONENT_DESCRIPTOR);
+SortedMapString,Properties map =
CamelContextHelper.findComponents(this, iter);
+answer.putAll(map);
+}
+return answer;
}
@Override
git commit: CAMEL-6428: camel-salesforce component. Thanks to Dhiraj Bokde for the contribution.
Updated Branches:
refs/heads/master 3553b95ad - 512b0a165
CAMEL-6428: camel-salesforce component. Thanks to Dhiraj Bokde for the
contribution.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/512b0a16
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/512b0a16
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/512b0a16
Branch: refs/heads/master
Commit: 512b0a165273dd0296580997fef6002635ed034b
Parents: 3553b95
Author: Claus Ibsen davscl...@apache.org
Authored: Sat Jun 8 08:57:59 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sat Jun 8 08:57:59 2013 +0200
--
.../camel-salesforce-component/pom.xml |5 +
.../component/salesforce/SalesforceComponent.java | 96 +++-
.../component/salesforce/SalesforceConsumer.java | 13 +-
.../component/salesforce/SalesforceEndpoint.java | 11 +-
.../salesforce/SalesforceEndpointConfig.java | 58 +++--
.../component/salesforce/SalesforceProducer.java |2 +-
.../internal/client/DefaultRestClient.java | 27 +-
.../internal/processor/AbstractRestProcessor.java | 25 +--
.../salesforce/BulkApiBatchIntegrationTest.java| 18 +-
.../component/salesforce/LoginConfigHelper.java|2 +-
.../salesforce/RestApiIntegrationTest.java | 56 ++---
.../SalesforceComponentConfigurationTest.java | 201 +++
.../apache/camel/maven/CamelSalesforceMojo.java| 34 +--
.../maven/CamelSalesforceMojoIntegrationTest.java |2 +-
14 files changed, 410 insertions(+), 140 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/512b0a16/components/camel-salesforce/camel-salesforce-component/pom.xml
--
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 5d6c831..933e2f5 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -45,6 +45,11 @@
artifactIdcamel-core/artifactId
/dependency
dependency
+ groupIdorg.apache.camel/groupId
+ artifactIdspi-annotations/artifactId
+ version${project.version}/version
+/dependency
+dependency
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-client/artifactId
/dependency
http://git-wip-us.apache.org/repos/asf/camel/blob/512b0a16/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 57ee583..4f075e0 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -16,35 +16,42 @@
*/
package org.apache.camel.component.salesforce;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
+import org.apache.camel.CamelContext;
+import org.apache.camel.ComponentConfiguration;
import org.apache.camel.Endpoint;
import org.apache.camel.component.salesforce.api.SalesforceException;
+import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
import org.apache.camel.component.salesforce.internal.OperationName;
import org.apache.camel.component.salesforce.internal.SalesforceSession;
import
org.apache.camel.component.salesforce.internal.streaming.SubscriptionHelper;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
+import org.apache.camel.spi.EndpointCompleter;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ReflectionHelper;
import org.apache.camel.util.ServiceHelper;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.RedirectListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* Represents the component that manages {@link SalesforceEndpoint}.
*/
-public class SalesforceComponent extends DefaultComponent {
+public class SalesforceComponent
git commit: fixed findComponents() for in blueprint too (had missed there's 2 OSGi camel context implementations - DOH ; )
Updated Branches:
refs/heads/master 512b0a165 - d33db16a3
fixed findComponents() for in blueprint too (had missed there's 2 OSGi camel
context implementations - DOH ;)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d33db16a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d33db16a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d33db16a
Branch: refs/heads/master
Commit: d33db16a385d1eaf1ced7da8766aaa7e4175b783
Parents: 512b0a1
Author: James Strachan james.strac...@gmail.com
Authored: Sat Jun 8 09:47:49 2013 +0200
Committer: James Strachan james.strac...@gmail.com
Committed: Sat Jun 8 10:29:09 2013 +0200
--
.../camel/blueprint/BlueprintCamelContext.java |9 +
.../camel/core/osgi/OsgiDefaultCamelContext.java | 16 +---
.../camel/core/osgi/utils/BundleContextUtils.java | 28 +++
3 files changed, 39 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d33db16a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
--
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
index cded338..8a86bf6 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.blueprint;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.camel.TypeConverter;
import org.apache.camel.core.osgi.OsgiCamelContextHelper;
import org.apache.camel.core.osgi.OsgiFactoryFinderResolver;
@@ -25,6 +29,7 @@ import
org.apache.camel.core.osgi.utils.BundleDelegatingClassLoader;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Registry;
+import org.apache.camel.util.LoadPropertiesException;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
@@ -109,6 +114,10 @@ public class BlueprintCamelContext extends
DefaultCamelContext implements Servic
stop();
}
+@Override
+public MapString, Properties findComponents() throws
LoadPropertiesException, IOException {
+return BundleContextUtils.findComponents(bundleContext, this);
+}
@Override
public void blueprintEvent(BlueprintEvent event) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d33db16a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
--
diff --git
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
index 1a7b472..d049f1c 100644
---
a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
+++
b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiDefaultCamelContext.java
@@ -17,21 +17,15 @@
package org.apache.camel.core.osgi;
import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
import java.util.Map;
import java.util.Properties;
-import java.util.SortedMap;
-import java.util.TreeMap;
import org.apache.camel.TypeConverter;
import org.apache.camel.core.osgi.utils.BundleContextUtils;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Registry;
-import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.LoadPropertiesException;
-import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
public class OsgiDefaultCamelContext extends DefaultCamelContext {
@@ -49,15 +43,9 @@ public class OsgiDefaultCamelContext extends
DefaultCamelContext {
OsgiCamelContextHelper.osgiUpdate(this, bundleContext);
}
+@Override
public MapString, Properties findComponents() throws
LoadPropertiesException, IOException {
-SortedMapString, Properties answer = new TreeMapString,
Properties();
-Bundle[] bundles = bundleContext.getBundles();
-for (Bundle bundle : bundles) {
-EnumerationURL iter =
bundle.getResources(CamelContextHelper.COMPONENT_DESCRIPTOR);
-SortedMapString,Properties map =
CamelContextHelper.findComponents(this, iter);
-answer.putAll(map);
-}
-
[2/2] git commit: Changed the surefire fork mode to make sure the blueprint tests can be passed
Changed the surefire fork mode to make sure the blueprint tests can be passed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c59092e5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c59092e5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c59092e5
Branch: refs/heads/master
Commit: c59092e50c43b294bc4ecea424281e450ed18d97
Parents: d33db16
Author: Willem Jiang ningji...@apache.org
Authored: Fri Jun 7 21:13:56 2013 +0800
Committer: Willem Jiang ningji...@apache.org
Committed: Sun Jun 9 08:56:34 2013 +0800
--
components/camel-test-blueprint/pom.xml | 11 ++-
.../BlueprintProduceConsumeImplicitPropertyTest.java | 4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c59092e5/components/camel-test-blueprint/pom.xml
--
diff --git a/components/camel-test-blueprint/pom.xml
b/components/camel-test-blueprint/pom.xml
index d39c9e2..6843f8d 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -163,5 +163,14 @@
/dependency
/dependencies
-
+build
+plugins
+plugin
+artifactIdmaven-surefire-plugin/artifactId
+configuration
+forkModepertest/forkMode
+/configuration
+/plugin
+/plugins
+/build
/project
http://git-wip-us.apache.org/repos/asf/camel/blob/c59092e5/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintProduceConsumeImplicitPropertyTest.java
--
diff --git
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintProduceConsumeImplicitPropertyTest.java
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintProduceConsumeImplicitPropertyTest.java
index e90450e..536cf74 100644
---
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintProduceConsumeImplicitPropertyTest.java
+++
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintProduceConsumeImplicitPropertyTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.test.blueprint;
-import org.junit.Ignore;
+//import org.junit.Ignore;
import org.junit.Test;
/**
@@ -30,7 +30,7 @@ public class BlueprintProduceConsumeImplicitPropertyTest
extends CamelBlueprintT
}
@Test
-@Ignore(Test fails. Fix Me!)
+//@Ignore(Test fails. Fix Me!)
public void testImplicit() throws Exception {
getMockEndpoint(mock:result).expectedMessageCount(1);
[1/2] git commit: CAMEL-6442 fix the IllegalStateException issue in camel-netty-http route
Updated Branches:
refs/heads/master d33db16a3 - 868a358ad
CAMEL-6442 fix the IllegalStateException issue in camel-netty-http route
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/868a358a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/868a358a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/868a358a
Branch: refs/heads/master
Commit: 868a358adb801498e2e82b7d8f65547fd4e62eba
Parents: c59092e
Author: Willem Jiang ningji...@apache.org
Authored: Sat Jun 8 22:33:01 2013 +0800
Committer: Willem Jiang ningji...@apache.org
Committed: Sun Jun 9 08:56:34 2013 +0800
--
.../netty/http/NettyRouteSimpleTest.java| 51
.../camel/component/netty/NettyProducer.java| 19 +++-
2 files changed, 69 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/868a358a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyRouteSimpleTest.java
--
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyRouteSimpleTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyRouteSimpleTest.java
new file mode 100644
index 000..ae5e1ee
--- /dev/null
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyRouteSimpleTest.java
@@ -0,0 +1,51 @@
+/**
+ * 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.
+ */
+package org.apache.camel.component.netty.http;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
+public class NettyRouteSimpleTest extends BaseNettyTest {
+
+@Test
+public void testHttpSimple() throws Exception {
+getMockEndpoint(mock:input1).expectedBodiesReceived(Hello World);
+getMockEndpoint(mock:input2).expectedBodiesReceived(Hello World);
+
+String out =
template.requestBody(netty-http:http://localhost:{{port}}/foo;, Hello World,
String.class);
+assertEquals(Bye World, out);
+
+assertMockEndpointsSatisfied();
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+int port2 = getNextPort();
+
+@Override
+public void configure() throws Exception {
+from(netty-http:http://0.0.0.0:{{port}}/foo;)
+.to(mock:input1)
+.to(netty-http:http://0.0.0.0:; + port2 + /bar);
+from(netty-http:http://0.0.0.0:; + port2 + /bar)
+.to(mock:input2)
+.transform().constant(Bye World);
+}
+};
+}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/868a358a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
--
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
index df3c40e..77cee1c 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.netty;
import java.net.InetSocketAddress;
import java.util.Map;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelContext;
@@ -399,7 +401,22 @@ public class NettyProducer extends DefaultAsyncProducer {
if (LOG.isTraceEnabled()) {
LOG.trace(Waiting for operation to complete {} for {} millis,
channelFuture, configuration.getConnectTimeout());
}
-
