Author: hadrian
Date: Wed Sep 28 21:26:40 2011
New Revision: 1177066
URL: http://svn.apache.org/viewvc?rev=1177066&view=rev
Log:
CAMEL-4034. Fix for component discovery
Modified:
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java
camel/trunk/components/camel-jclouds/src/main/resources/META-INF/services/org/apache/camel/component/jclouds
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java
Modified:
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java?rev=1177066&r1=1177065&r2=1177066&view=diff
==============================================================================
---
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java
(original)
+++
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java
Wed Sep 28 21:26:40 2011
@@ -45,6 +45,7 @@ public class JcloudsBlobStoreProducer ex
String blobName = getBlobName(exchange);
String operation = getOperation(exchange);
+ LOG.trace("Processing {} operation on '{}'", operation, container +
"/" + blobName);
Object body = exchange.getIn().getBody();
if (JcloudsConstants.GET.equals(operation)) {
exchange.getOut().setBody(JcloudsBlobStoreHelper.readBlob(blobStore, container,
blobName, Thread.currentThread().getContextClassLoader()));
Modified:
camel/trunk/components/camel-jclouds/src/main/resources/META-INF/services/org/apache/camel/component/jclouds
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/main/resources/META-INF/services/org/apache/camel/component/jclouds?rev=1177066&r1=1177065&r2=1177066&view=diff
==============================================================================
---
camel/trunk/components/camel-jclouds/src/main/resources/META-INF/services/org/apache/camel/component/jclouds
(original)
+++
camel/trunk/components/camel-jclouds/src/main/resources/META-INF/services/org/apache/camel/component/jclouds
Wed Sep 28 21:26:40 2011
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.component.ldap.JcloudsComponent
+class=org.apache.camel.component.jclouds.JcloudsComponent
Modified:
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java?rev=1177066&r1=1177065&r2=1177066&view=diff
==============================================================================
---
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
(original)
+++
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
Wed Sep 28 21:26:40 2011
@@ -34,8 +34,6 @@ public class JcloudsBlobStoreProducerTes
BlobStoreContextFactory contextFactory = new BlobStoreContextFactory();
BlobStoreContext blobStoreContext =
contextFactory.createContext("transient", "identity", "credential");
BlobStore blobStore = blobStoreContext.getBlobStore();
- JcloudsComponent jcloudsComponent = new JcloudsComponent();
-
@Test
public void testBlobStorePut() throws InterruptedException {
@@ -58,11 +56,10 @@ public class JcloudsBlobStoreProducerTes
protected RouteBuilder createRouteBuilder() throws Exception {
blobStore.createContainerInLocation(null, TEST_CONTAINER);
- jcloudsComponent.setBlobStores(Lists.newArrayList(blobStore));
+
((JcloudsComponent)context.getComponent("jclouds")).setBlobStores(Lists.newArrayList(blobStore));
return new RouteBuilder() {
public void configure() {
- getContext().addComponent("jclouds", jcloudsComponent);
from("direct:put")
.setHeader(JcloudsConstants.BLOB_NAME,
constant(TEST_BLOB))
.setHeader(JcloudsConstants.CONTAINER_NAME,
constant(TEST_CONTAINER))
Modified:
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java?rev=1177066&r1=1177065&r2=1177066&view=diff
==============================================================================
---
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java
(original)
+++
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java
Wed Sep 28 21:26:40 2011
@@ -124,6 +124,7 @@ public class JcloudsSpringComputeTest ex
}
}
+ @SuppressWarnings("unchecked")
@Ignore("For now not possible to combine stub provider with ssh module,
requird for runScript")
@Test
public void testRunScript() throws InterruptedException {
@@ -143,7 +144,7 @@ public class JcloudsSpringComputeTest ex
for (NodeMetadata nodeMetadata : nodeMetadatas) {
runScriptHeaders.put(JcloudsConstants.NODE_ID,
nodeMetadata.getId());
destroyHeaders.put(JcloudsConstants.NODE_ID, nodeMetadata.getId());
- String output = (String)
template.requestBodyAndHeaders("direct:in-out", "Some message",
runScriptHeaders);
+ template.requestBodyAndHeaders("direct:in-out", "Some message",
runScriptHeaders);
template.sendBodyAndHeaders("direct:in-out", "Some message",
destroyHeaders);
}
}
