svn commit: r1464865 - /camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java
Author: bvahdat
Date: Fri Apr 5 06:35:58 2013
New Revision: 1464865
URL: http://svn.apache.org/r1464865
Log:
Fixed the compilation error on the CI-Server.
Modified:
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java
Modified:
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java?rev=1464865r1=1464864r2=1464865view=diff
==
---
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java
(original)
+++
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java
Fri Apr 5 06:35:58 2013
@@ -74,20 +74,20 @@ public abstract class AbstractRouteComma
private static final class RouteComparator implements ComparatorRoute {
@Override
-public int compare(Route o1, Route o2) {
+public int compare(Route route1, Route route2) {
// sort by camel context first
-CamelContext camel1 = o1.getRouteContext().getCamelContext();
-CamelContext camel2 = o2.getRouteContext().getCamelContext();
+CamelContext camel1 = route1.getRouteContext().getCamelContext();
+CamelContext camel2 = route2.getRouteContext().getCamelContext();
if (camel1.getName().equals(camel2.getName())) {
// and then accordingly to startup order
-int order1 = getRouteStartupOrder(camel1, o1.getId());
-int order2 = getRouteStartupOrder(camel2, o2.getId());
+Integer order1 = getRouteStartupOrder(camel1, route1.getId());
+Integer order2 = getRouteStartupOrder(camel2, route2.getId());
if (order1 == 0 order2 == 0) {
// fallback and use name if not startup order was found
-return o1.getId().compareTo(o2.getId());
+return route1.getId().compareTo(route2.getId());
} else {
-return Integer.compare(order1, order2);
+return order1.compareTo(order2);
}
} else {
return camel1.getName().compareTo(camel2.getName());
svn commit: r1464879 - /camel/trunk/parent/pom.xml
Author: jstrachan Date: Fri Apr 5 08:10:28 2013 New Revision: 1464879 URL: http://svn.apache.org/r1464879 Log: upgraded to the latest rxjava release Modified: camel/trunk/parent/pom.xml Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1464879r1=1464878r2=1464879view=diff == --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Fri Apr 5 08:10:28 2013 @@ -315,7 +315,7 @@ rhino-version1.7R2/rhino-version rome-bundle-version1.0_3/rome-bundle-version rome-version1.0/rome-version -rxjava-version0.6.0/rxjava-version +rxjava-version0.6.3/rxjava-version saaj-impl-version1.3.2_2/saaj-impl-version saxon-bundle-version9.4.0.4_2/saxon-bundle-version saxon-version9.4.0.4/saxon-version
svn commit: r1464887 - /camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
Author: bvahdat
Date: Fri Apr 5 08:32:12 2013
New Revision: 1464887
URL: http://svn.apache.org/r1464887
Log:
Fixed the CS.
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java?rev=1464887r1=1464886r2=1464887view=diff
==
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
Fri Apr 5 08:32:12 2013
@@ -102,7 +102,7 @@ public class BindyCsvFactory extends Bin
public void initAnnotatedFields() {
- int maxpos = 0;
+int maxpos = 0;
for (Class? cl : models) {
ListField linkFields = new ArrayListField();
@@ -126,8 +126,8 @@ public class BindyCsvFactory extends Bin
int pos = dataField.pos();
if (annotatedFields.containsKey(pos)) {
- Field f = annotatedFields.get(pos);
- LOG.warn(Potentially invalid model: existing
@DataField '{}' replaced by '{}', f.getName(), field.getName());
+Field f = annotatedFields.get(pos);
+LOG.warn(Potentially invalid model: existing
@DataField '{}' replaced by '{}', f.getName(), field.getName());
}
dataFields.put(pos, dataField);
annotatedFields.put(pos, field);
@@ -158,7 +158,7 @@ public class BindyCsvFactory extends Bin
}
if (annotatedFields.size() maxpos) {
- LOG.info(Potentially incomplete model: some csv fields may not
be mapped to @DataField members);
+LOG.info(Potentially incomplete model: some csv fields may not be
mapped to @DataField members);
}
}
svn commit: r1464888 - in /camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy: classtype/ csv/ fixed/delimited/ fixed/dynamic/ fixed/headerfooter/ fixed/implied/ fixed/
Author: bvahdat
Date: Fri Apr 5 08:37:42 2013
New Revision: 1464888
URL: http://svn.apache.org/r1464888
Log:
CAMEL-6241: Fixed the failed tests of camel-bindy in case the language of the
JRE default Locale was something other than english, e.g. de.
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallDslTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallPositionModifiedTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvNullMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/delimited/BindyFixedLengthDelimitedFieldTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/dynamic/BindyFixedLengthDynamicFieldTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/headerfooter/BindySimpleFixedLengthHeaderFooterTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/implied/BindyImpliedTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/number/BindyNumberTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/ordinal/BindySimpleFixedLengthOrdinalPosTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/skipheader/BindyFixedLengthHeaderFooterSkipHeaderTest.java
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java?rev=1464888r1=1464887r2=1464888view=diff
==
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeAsStringTest.java
Fri Apr 5 08:37:42 2013
@@ -22,6 +22,7 @@ import java.util.GregorianCalendar;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
+import org.apache.camel.model.dataformat.BindyDataFormat;
import org.apache.camel.model.dataformat.BindyType;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -91,8 +92,13 @@ public class BindyCsvClassTypeAsStringTe
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+BindyDataFormat bindy = new BindyDataFormat();
+
bindy.setClassType(org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class);
+bindy.setLocale(en);
+bindy.setType(BindyType.Csv);
+
from(direct:in)
-.marshal().bindy(BindyType.Csv,
org.apache.camel.dataformat.bindy.model.simple.oneclass.Order.class)
+.marshal(bindy)
.to(mock:in);
from(direct:out)
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/classtype/BindyCsvClassTypeTest.java
URL:
svn commit: r1464935 - /camel/trunk/parent/pom.xml
Author: davsclaus Date: Fri Apr 5 12:05:36 2013 New Revision: 1464935 URL: http://svn.apache.org/r1464935 Log: Upgraded to Netty 3.6.4 Modified: camel/trunk/parent/pom.xml Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1464935r1=1464934r2=1464935view=diff == --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Fri Apr 5 12:05:36 2013 @@ -281,7 +281,7 @@ mvel-version2.1.3.Final/mvel-version mybatis-version3.2.1/mybatis-version neethi-bundle-version3.0.1/neethi-bundle-version -netty-version3.6.3.Final/netty-version +netty-version3.6.4.Final/netty-version ode-version1.3.4/ode-version !-- should be in-sync with deltaspike -- openwebbeans-version1.1.5/openwebbeans-version
svn commit: r1464963 - in /camel/trunk/components/camel-krati/src: main/java/org/apache/camel/component/krati/ main/java/org/apache/camel/component/krati/processor/idempotent/ main/java/org/apache/cam
Author: davsclaus
Date: Fri Apr 5 13:09:04 2013
New Revision: 1464963
URL: http://svn.apache.org/r1464963
Log:
CAMEL-6242: Krati component - Should preserve headers
Modified:
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiProducer.java
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/processor/idempotent/KratiIdempotentRepository.java
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java
camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerTest.java
Modified:
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java?rev=1464963r1=1464962r2=1464963view=diff
==
---
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java
(original)
+++
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java
Fri Apr 5 13:09:04 2013
@@ -40,7 +40,6 @@ public class KratiConsumer extends Sched
protected final KratiEndpoint endpoint;
protected DataStoreObject, Object dataStore;
-protected int maxMessagesPerPoll = 10;
public KratiConsumer(KratiEndpoint endpoint, Processor processor,
DataStoreObject, Object dataStore) {
super(endpoint, processor);
@@ -88,12 +87,12 @@ public class KratiConsumer extends Sched
try {
dataStore.delete(exchange.getProperty(KratiConstants.KEY));
} catch (Exception e) {
-LOG.warn(Failed to remove from datastore., e);
+LOG.warn(Failed to remove from datastore. This
exception is ignored., e);
}
}
public void onFailure(Exchange exchange) {
- //emtpy
+ // noop
}
});
Modified:
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java?rev=1464963r1=1464962r2=1464963view=diff
==
---
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java
(original)
+++
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java
Fri Apr 5 13:09:04 2013
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.krati;
import java.io.IOException;
@@ -42,7 +41,7 @@ public class KratiDataStoreRegistration
try {
dataStore.close();
} catch (IOException e) {
-LOG.warn(Error while closing datastore., e);
+LOG.warn(Error while closing datastore. This exception is
ignored., e);
}
return true;
} else {
Modified:
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java?rev=1464963r1=1464962r2=1464963view=diff
==
---
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
(original)
+++
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
Fri Apr 5 13:09:04 2013
@@ -82,7 +82,7 @@ public final class KratiHelper {
try {
result = new DynamicDataSet(homeDir, initialCapacity,
segmentFactory);
} catch (Exception e) {
-throw new RuntimeCamelException(Failed to create Krati DataSet.,
e);
+throw new RuntimeCamelException(Failed to create Krati DataSet.
This exception is ignored., e);
}
return result;
}
Modified:
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiProducer.java
URL:
svn commit: r1464964 - in /camel/branches/camel-2.10.x: ./ components/camel-krati/src/main/java/org/apache/camel/component/krati/ components/camel-krati/src/main/java/org/apache/camel/component/krati/
Author: davsclaus
Date: Fri Apr 5 13:09:58 2013
New Revision: 1464964
URL: http://svn.apache.org/r1464964
Log:
CAMEL-6242: Krati component - Should preserve headers
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiProducer.java
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/processor/idempotent/KratiIdempotentRepository.java
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java
camel/branches/camel-2.10.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerTest.java
Propchange: camel/branches/camel-2.10.x/
--
Merged /camel/trunk:r1464963
Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java?rev=1464964r1=1464963r2=1464964view=diff
==
---
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiConsumer.java
Fri Apr 5 13:09:58 2013
@@ -40,7 +40,6 @@ public class KratiConsumer extends Sched
protected final KratiEndpoint endpoint;
protected DataStoreObject, Object dataStore;
-protected int maxMessagesPerPoll = 10;
public KratiConsumer(KratiEndpoint endpoint, Processor processor,
DataStoreObject, Object dataStore) {
super(endpoint, processor);
@@ -88,12 +87,12 @@ public class KratiConsumer extends Sched
try {
dataStore.delete(exchange.getProperty(KratiConstants.KEY));
} catch (Exception e) {
-LOG.warn(Failed to remove from datastore., e);
+LOG.warn(Failed to remove from datastore. This
exception is ignored., e);
}
}
public void onFailure(Exchange exchange) {
- //emtpy
+ // noop
}
});
Modified:
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java?rev=1464964r1=1464963r2=1464964view=diff
==
---
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java
Fri Apr 5 13:09:58 2013
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.krati;
import java.io.IOException;
@@ -42,7 +41,7 @@ public class KratiDataStoreRegistration
try {
dataStore.close();
} catch (IOException e) {
-LOG.warn(Error while closing datastore., e);
+LOG.warn(Error while closing datastore. This exception is
ignored., e);
}
return true;
} else {
Modified:
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java?rev=1464964r1=1464963r2=1464964view=diff
==
---
camel/branches/camel-2.10.x/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
(original)
+++
svn commit: r857419 - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache hazelcast-component.html
Author: buildbot Date: Fri Apr 5 17:26:18 2013 New Revision: 857419 Log: Production update by buildbot for camel Modified: websites/production/camel/content/book-component-appendix.html websites/production/camel/content/book-in-one-page.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/hazelcast-component.html Modified: websites/production/camel/content/book-component-appendix.html == --- websites/production/camel/content/book-component-appendix.html (original) +++ websites/production/camel/content/book-component-appendix.html Fri Apr 5 17:26:18 2013 @@ -5470,7 +5470,7 @@ http://java.sun.com/xml/ns/javaee/web-ap pbAvailable as of Camel 2.7/b/p -pThe bhazelcast:/b component allows you to work with the a shape=rect class=external-link href=http://www.hazelcast.com; rel=nofollowHazelcast/a distributed data grid / cache. Hazelcast is a in memory data grid, entirely written in Java (single jar). It offers a great palette of different data stores like map, multi map (same key, n values), queue, list and atomic number. The main reason to use Hazelcast is its simple cluster support. If you have enabled multicast on your network you can run a cluster with hundred nodes with no extra configuration. Hazelcast can simply configured to add additional features like n copies between nodes (default is 1), cache persistence, network configuration (if needed), near cache, enviction and so on. For more information consult the Hazelcast documentation on a shape=rect class=external-link href=http://www.hazelcast.com/documentation.jsp; rel=nofollowhttp://www.hazelcast.com/documentation.jsp/a./p +pThe bhazelcast:/b component allows you to work with the a shape=rect class=external-link href=http://www.hazelcast.com; rel=nofollowHazelcast/a distributed data grid / cache. Hazelcast is a in memory data grid, entirely written in Java (single jar). It offers a great palette of different data stores like map, multi map (same key, n values), queue, list and atomic number. The main reason to use Hazelcast is its simple cluster support. If you have enabled multicast on your network you can run a cluster with hundred nodes with no extra configuration. Hazelcast can simply configured to add additional features like n copies between nodes (default is 1), cache persistence, network configuration (if needed), near cache, enviction and so on. For more information consult the Hazelcast documentation on a shape=rect class=external-link href=http://www.hazelcast.com/docs.jsp; rel=nofollowhttp://www.hazelcast.com/docs.jsp/a./p pMaven users will need to add the following dependency to their ttpom.xml/tt for this component:/p div class=code panel style=border-width: 1px;div class=codeContent panelContent Modified: websites/production/camel/content/book-in-one-page.html == --- websites/production/camel/content/book-in-one-page.html (original) +++ websites/production/camel/content/book-in-one-page.html Fri Apr 5 17:26:18 2013 @@ -26439,7 +26439,7 @@ http://java.sun.com/xml/ns/javaee/web-ap pbAvailable as of Camel 2.7/b/p -pThe bhazelcast:/b component allows you to work with the a shape=rect class=external-link href=http://www.hazelcast.com; rel=nofollowHazelcast/a distributed data grid / cache. Hazelcast is a in memory data grid, entirely written in Java (single jar). It offers a great palette of different data stores like map, multi map (same key, n values), queue, list and atomic number. The main reason to use Hazelcast is its simple cluster support. If you have enabled multicast on your network you can run a cluster with hundred nodes with no extra configuration. Hazelcast can simply configured to add additional features like n copies between nodes (default is 1), cache persistence, network configuration (if needed), near cache, enviction and so on. For more information consult the Hazelcast documentation on a shape=rect class=external-link href=http://www.hazelcast.com/documentation.jsp; rel=nofollowhttp://www.hazelcast.com/documentation.jsp/a./p +pThe bhazelcast:/b component allows you to work with the a shape=rect class=external-link href=http://www.hazelcast.com; rel=nofollowHazelcast/a distributed data grid / cache. Hazelcast is a in memory data grid, entirely written in Java (single jar). It offers a great palette of different data stores like map, multi map (same key, n values), queue, list and atomic number. The main reason to use Hazelcast is its simple cluster support. If you have enabled multicast on your network you can run a cluster with hundred nodes with no extra configuration. Hazelcast can simply configured to add additional features like n copies between nodes (default is 1), cache persistence, network configuration (if needed), near cache, enviction
svn commit: r1465099 - in /camel/trunk/components/camel-aws/src: main/java/org/apache/camel/component/aws/s3/S3Producer.java test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
Author: bvahdat
Date: Fri Apr 5 19:07:32 2013
New Revision: 1465099
URL: http://svn.apache.org/r1465099
Log:
Close the InputStream properly in case the DeleteAfterWrite option is enabled.
This fixes the failed S3ComponentFileTest on Windows as well.
Modified:
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
Modified:
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java?rev=1465099r1=1465098r2=1465099view=diff
==
---
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
(original)
+++
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
Fri Apr 5 19:07:32 2013
@@ -33,6 +33,7 @@ import org.apache.camel.InvalidPayloadEx
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.FileUtil;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -132,6 +133,7 @@ public class S3Producer extends DefaultP
}
if (getConfiguration().isDeleteAfterWrite() filePayload != null) {
+IOHelper.close(putObjectRequest.getInputStream());
FileUtil.deleteFile(filePayload);
}
}
Modified:
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java?rev=1465099r1=1465098r2=1465099view=diff
==
---
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
(original)
+++
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
Fri Apr 5 19:07:32 2013
@@ -118,7 +118,12 @@ public class S3ComponentFileTest extends
private void assertResultExchange(Exchange resultExchange) {
assertIsInstanceOf(InputStream.class,
resultExchange.getIn().getBody());
-assertEquals(This is my bucket content.,
resultExchange.getIn().getBody(String.class));
+
+if (!sendFileAndDelete.equals(getTestMethodName())) {
+// as we delete the file using the deleteAfterWrite=true option
here we can not assert on it's content anymore
+assertEquals(This is my bucket content.,
resultExchange.getIn().getBody(String.class));
+}
+
assertEquals(mycamelbucket,
resultExchange.getIn().getHeader(S3Constants.BUCKET_NAME));
assertEquals(CamelUnitTest,
resultExchange.getIn().getHeader(S3Constants.KEY));
assertNull(resultExchange.getIn().getHeader(S3Constants.VERSION_ID));
// not enabled on this bucket
[CONF] Apache Camel Guava EventBus
Guava EventBus
Page edited by Henryk Konsek
Comment:
[Guava EventBus] Added section on consuming multiple type of events
Changes (1)
...
from(guava-eventbus:busName?listenerInterface=com.example.CustomListener).to(seda:queue); {code}
h3. Consuming multiple type of events In order to define multiple type of events to be consumed by Guava EventBus consumer use {{listenerInterface}} endpoint option, as listener interface could provide multiple methods marked with the {{@Subscribe}} annotation. {code} package com.example; public interface MultipleEventsListener {@Subscribe void someEventReceived(SomeEvent event);@Subscribe void anotherEventReceived(AnotherEvent event); } {code} The listener presented above could be used in the endpoint definition as follows. {code} from(guava-eventbus:busName?listenerInterface=com.example.MultipleEventsListener).to(seda:queue); {code}
Full Content
Guava EventBus Component
Available since Camel 2.10.0
The Google Guava EventBus allows publish-subscribe-style communication between components without requiring the components to explicitly register with one another (and thus be aware of each other). The guava-eventbus: component provides integration bridge between Camel and Google Guava EventBus infrastructure. With the latter component, messages exchanged with the Guava EventBus can be transparently forwarded to the Camel routes. EventBus component allows also to route body of Camel exchanges to the Guava EventBus.
Maven users will need to add the following dependency to their pom.xml for this component:
dependency
groupIdorg.apache.camel/groupId
artifactIdcamel-guava-eventbus/artifactId
versionx.x.x/version
!-- use the same version as your Camel core version --
/dependency
URI format
guava-eventbus:busName[?options]
Where busName represents the name of the com.google.common.eventbus.EventBus instance located in the Camel registry.
Options
Name
Default Value
Description
eventClass
null
Camel 2.10: If used on the consumer side of the route, will filter events received from the EventBus to the instances of the class and superclasses of eventClass. Null value of this option is equal to setting it to the java.lang.Object i.e. the consumer will capture all messages incoming to the event bus. This option cannot be used together with listenerInterface option.
listenerInterface
null
Camel 2.11: The interface with method(s) marked with the @Subscribe annotation. Dynamic proxy will be created over the interface so it could be registered as the EventBus listener. Particularly useful when creating multi-event listeners and for handling DeadEvent properly. This option cannot be used together with eventClass option.
Usage
Using guava-eventbus component on the consumer side of the route will capture messages sent to the Guava EventBus and forward them to the Camel route. Guava EventBus consumer processes incoming messages asynchronously.
SimpleRegistry registry = new SimpleRegistry();
EventBus eventBus = new EventBus();
registry.put("busName", eventBus);
CamelContext camel = new DefaultCamelContext(registry);
from("guava-eventbus:busName").to("seda:queue");
eventBus.post("Send me to the SEDA queue.");
Using guava-eventbus component on the producer side of the route will forward body of the Camel exchanges to the Guava EventBus instance.
SimpleRegistry registry = new SimpleRegistry();
EventBus eventBus = new EventBus();
registry.put("busName", eventBus);
CamelContext camel = new DefaultCamelContext(registry);
from("direct:start").to("guava-eventbus:busName");
ProducerTemplate producerTemplate = camel.createProducerTemplate();
producer.sendBody("direct:start", "Send me to the Guava EventBus.");
eventBus.register(new Object(){
@Subscribe
public void messageHander(String message) {
System.out.println("Message received from the Camel: " + message);
}
});
DeadEvent considerations
Keep in mind that due to the limitations caused by the design of the Guava EventBus, you cannot specify event class to be received by the listener without creating class annotated with @Subscribe method. This limitation implies that endpoint with eventClass option specified actually listens to all possible events (java.lang.Object) and filter appropriate messages programmatically at runtime. The snipped below demonstrates an appropriate excerpt from the Camel code base.
@Subscribe
public void eventReceived(Object event) {
if (eventClass == null || eventClass.isAssignableFrom(event.getClass())) {
doEventReceived(event);
...
This drawback of this approach is that EventBus instance used by Camel will never generate
svn commit: r1465102 - /camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
Author: bvahdat
Date: Fri Apr 5 19:36:52 2013
New Revision: 1465102
URL: http://svn.apache.org/r1465102
Log:
Be more precise with the code comment.
Modified:
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
Modified:
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java?rev=1465102r1=1465101r2=1465102view=diff
==
---
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
(original)
+++
camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
Fri Apr 5 19:36:52 2013
@@ -120,7 +120,8 @@ public class S3ComponentFileTest extends
assertIsInstanceOf(InputStream.class,
resultExchange.getIn().getBody());
if (!sendFileAndDelete.equals(getTestMethodName())) {
-// as we delete the file using the deleteAfterWrite=true option
here we can not assert on it's content anymore
+// assert on the file content only in case the deleteAfterWrite
option is NOT enabled
+// in which case we would still have the file and thereby could
assert on it's content
assertEquals(This is my bucket content.,
resultExchange.getIn().getBody(String.class));
}
svn commit: r857437 - in /websites/production/camel/content: cache/main.pageCache guava-eventbus.html
Author: buildbot
Date: Fri Apr 5 20:18:44 2013
New Revision: 857437
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/guava-eventbus.html
Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.
Modified: websites/production/camel/content/guava-eventbus.html
==
--- websites/production/camel/content/guava-eventbus.html (original)
+++ websites/production/camel/content/guava-eventbus.html Fri Apr 5 20:18:44
2013
@@ -184,6 +184,34 @@ eventBus.register(span class=code-keyw
pre class=code-java
from(span
class=code-quoteguava-eventbus:busName?listenerInterface=com.example.CustomListener/span).to(span
class=code-quoteseda:queue/span);
/pre
+/div/div
+
+h3a shape=rect
name=GuavaEventBus-Consumingmultipletypeofevents/aConsuming multiple type
of events/h3
+
+pIn order to define multiple type of events to be consumed by Guava EventBus
consumer use ttlistenerInterface/tt endpoint option, as listener interface
could provide multiple methods marked with the tt@Subscribe/tt
annotation./p
+
+div class=code panel style=border-width: 1px;div class=codeContent
panelContent
+pre class=code-java
+span class=code-keywordpackage/span com.example;
+
+span class=code-keywordpublic/span span
class=code-keywordinterface/span MultipleEventsListener {
+
+ @Subscribe
+ void someEventReceived(SomeEvent event);
+
+ @Subscribe
+ void anotherEventReceived(AnotherEvent event);
+
+}
+/pre
+/div/div
+
+pThe listener presented above could be used in the endpoint definition as
follows./p
+
+div class=code panel style=border-width: 1px;div class=codeContent
panelContent
+pre class=code-java
+from(span
class=code-quoteguava-eventbus:busName?listenerInterface=com.example.MultipleEventsListener/span).to(span
class=code-quoteseda:queue/span);
+/pre
/div/div/div
/td
td valign=top
svn commit: r1465130 - in /camel/trunk/examples/camel-example-cxf-blueprint: README.txt src/main/resources/META-INF/wsdl/report_incident.wsdl
Author: cmueller
Date: Fri Apr 5 21:13:26 2013
New Revision: 1465130
URL: http://svn.apache.org/r1465130
Log:
fixed the description of camel-example-cxf-blueprint
Modified:
camel/trunk/examples/camel-example-cxf-blueprint/README.txt
camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
Modified: camel/trunk/examples/camel-example-cxf-blueprint/README.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-blueprint/README.txt?rev=1465130r1=1465129r2=1465130view=diff
==
--- camel/trunk/examples/camel-example-cxf-blueprint/README.txt (original)
+++ camel/trunk/examples/camel-example-cxf-blueprint/README.txt Fri Apr 5
21:13:26 2013
@@ -13,23 +13,19 @@ the same port.
You will need to compile this example first:
mvn install
-To run the example on Apache ServiceMix 4.x or Apache Karaf 2.2.5 or better
+To run the example on Apache Karaf 2.3.1 or better
1) launch the server
- karaf.bat
+ karaf / karaf.bat
-Note for Karaf 2.2.5 onwards:
- a) copy the etc/jre.properties.cxf to override the existing
etc/jre.properties file
-
-
2) Add features required
- features:addUrl
mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
+ features:chooseurl camel ${version}
features:install war
features:install cxf
features:install camel-jaxb
+ features:install camel-blueprint
features:install camel-cxf
-
3) Deploy the example
osgi:install -s mvn:org.apache.camel/camel-example-cxf-blueprint/${version}
Modified:
camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl?rev=1465130r1=1465129r2=1465130view=diff
==
---
camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
(original)
+++
camel/trunk/examples/camel-example-cxf-blueprint/src/main/resources/META-INF/wsdl/report_incident.wsdl
Fri Apr 5 21:13:26 2013
@@ -85,7 +85,7 @@
!-- Service definition --
wsdl:service name=ReportIncidentEndpointService
wsdl:port name=ReportIncidentService
binding=tns:ReportIncidentBinding
-soap:address
location=http://localhost:9080/part-five/webservices/incident/
+soap:address
location=http://localhost:8181/cxf/camel-example-cxf-blueprint/webservices/incident/
/wsdl:port
/wsdl:service
