You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2011/09/22 18:39:41 UTC
svn commit: r1174249 - in /camel/trunk/components/camel-jclouds/src:
main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java
test/resources/log4j.properties
Author: hadrian
Date: Thu Sep 22 16:39:40 2011
New Revision: 1174249
URL: http://svn.apache.org/viewvc?rev=1174249&view=rev
Log:
CAMEL-4034. Added ALv2 license message and minor fixes
Modified:
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java
camel/trunk/components/camel-jclouds/src/test/resources/log4j.properties
Modified: camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java?rev=1174249&r1=1174248&r2=1174249&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java (original)
+++ camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java Thu Sep 22 16:39:40 2011
@@ -177,7 +177,7 @@ public class JcloudsBlobStoreConsumer ex
try {
ois = new ObjectInputStream(is) {
@Override
- public Class resolveClass(ObjectStreamClass desc) throws IOException,
+ public Class<?> resolveClass(ObjectStreamClass desc) throws IOException,
ClassNotFoundException {
try {
return getEndpoint().getCamelContext().getClassResolver().resolveClass(desc.getName());
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=1174249&r1=1174248&r2=1174249&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 Thu Sep 22 16:39:40 2011
@@ -48,7 +48,7 @@ public class JcloudsBlobStoreProducer ex
if (blobName != null && exchange.getIn() != null && exchange.getIn().getBody() != null) {
Object body = exchange.getIn().getBody();
BlobStore blobStore = blobStoreContext.getBlobStore();
- Blob blob = blobStore.newBlob(blobName);
+ Blob blob = blobStore.blobBuilder(blobName).build();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = null;
try {
Modified: camel/trunk/components/camel-jclouds/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/test/resources/log4j.properties?rev=1174249&r1=1174248&r2=1174249&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-jclouds/src/test/resources/log4j.properties Thu Sep 22 16:39:40 2011
@@ -1,22 +1,40 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
#
-# The logging properties used
+# The logging properties used during tests
#
-log4j.rootLogger=INFO, out
-
-# uncomment the following line to turn on Camel debugging
-#log4j.logger.org.apache.camel=DEBUG
-
-# uncomment the following line to turn on ActiveMQ debugging
-#log4j.logger.org.apache.activemq=DEBUG
-
+log4j.rootLogger=INFO, file
log4j.logger.org.springframework=WARN
+# uncomment this to turn on debug of camel
+#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel.component.jclouds=TRACE
# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/camel-jaxb-test.log
+log4j.appender.file.append=true
-log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer