git commit: [CAMEL-7218] Rolled back PlatformHelper usage on the behalf of the old OSGi detection code.

2014-02-19 Thread hekonsek
Repository: camel
Updated Branches:
  refs/heads/master 8b9d4c625 - 667443aee


[CAMEL-7218] Rolled back PlatformHelper usage on the behalf of the old OSGi 
detection code.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/667443ae
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/667443ae
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/667443ae

Branch: refs/heads/master
Commit: 667443aee325b406e57b16d4c70d1971fb001294
Parents: 8b9d4c6
Author: Henryk Konsek hekon...@gmail.com
Authored: Wed Feb 19 09:55:45 2014 +0100
Committer: Henryk Konsek hekon...@gmail.com
Committed: Wed Feb 19 09:55:45 2014 +0100

--
 .../spring/handler/CamelNamespaceHandler.java   | 24 
 1 file changed, 15 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/667443ae/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
--
diff --git 
a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
 
b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
index 6535e69..957c792 100644
--- 
a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
+++ 
b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
@@ -51,7 +51,6 @@ import org.apache.camel.spring.CamelThreadPoolFactoryBean;
 import org.apache.camel.spring.remoting.CamelProxyFactoryBean;
 import org.apache.camel.spring.remoting.CamelServiceExporter;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.PlatformHelper;
 import org.apache.camel.util.spring.KeyStoreParametersFactoryBean;
 import org.apache.camel.util.spring.SSLContextParametersFactoryBean;
 import org.apache.camel.util.spring.SecureRandomParametersFactoryBean;
@@ -125,20 +124,27 @@ public class CamelNamespaceHandler extends 
NamespaceHandlerSupport {
 parserMap.put(errorHandler, errorHandlerParser);
 
 // camel context
+boolean osgi = false;
 Class? cl = CamelContextFactoryBean.class;
 // These code will try to detected if we are in the OSGi environment.
 // If so, camel will use the OSGi version of CamelContextFactoryBean 
to create the CamelContext.
-if (PlatformHelper.isInOsgiEnvironment(getClass().getClassLoader())) {
-try {
+try {
+// Try to load the BundleActivator first
+Class.forName(org.osgi.framework.BundleActivator);
+Class? c = Class.forName(org.apache.camel.osgi.Activator);
+Method mth = c.getDeclaredMethod(getBundle);
+Object bundle = mth.invoke(null);
+if (bundle != null) {
 cl = 
Class.forName(org.apache.camel.osgi.CamelContextFactoryBean);
-LOG.info(OSGi environment detected.);
-} catch (ClassNotFoundException e) {
-LOG.trace(Cannot find CamelContextFactoryBean class so 
assuming not running in OSGi container:  + e.getMessage());
+osgi = true;
 }
-} else {
-LOG.info(Non-OSGi environment detected.);
+} catch (Throwable t) {
+// not running with camel-core-osgi so we fallback to the regular 
factory bean
+LOG.trace(Cannot find class so assuming not running in OSGi 
container:  + t.getMessage());
 }
-
+if (osgi) {
+LOG.info(OSGi environment detected.);
+} 
 LOG.debug(Using {} as CamelContextBeanDefinitionParser, 
cl.getCanonicalName());
 registerParser(camelContext, new 
CamelContextBeanDefinitionParser(cl));
 }



[CONF] Apache Camel Crypto

2014-02-19 Thread willem jiang (Confluence)














  


willem jiang edited the page:
 


Crypto   






...
The Crypto Data Format integrates the Java Cryptographic Extension into Camel, allowing simple and flexible encryption and decryption of messages using Camel's familiar marshall and unmarshal formatting mechanism. It assumes marshalling to mean encryption to cyphertext and unmarshalling to mean decryption back to the original plaintext. This data format implements only symmetric (shared-key) encryption and decyption.
Options



 Wiki Markup




 
{div:class=confluenceTableSmall}
|| Name || Type || Default || Description ||
| {{algorithm}} | {{String}} | {{DES/CBC/PKCS5Padding}} | The JCE algorithm name indicating the cryptographic algorithm that will be used. |
| {{algorithmParameterSpec}} | {{java.security.spec.AlgorithmParameterSpec}} | {{null}} |A JCE AlgorithmParameterSpec used to initialize the Cipher. |
| {{bufferSize}} | {{Integer}} | {{2048}} | the size of the buffer used in the signature process. |
| {{cryptoProvider}} | {{String}} | {{null}} | The name of the JCE Security Provider that should be used. |
| {{initializationVector}} | {{byte[]}} | {{null}} | A byte array containing the Initialization Vector that will be used to initialize the Cipher. |
| {{inline}} | {{boolean}} | {{false}} | Flag indicating that the configured IV should be inlined into the encrypted data stream. |
| {{macAlgorithm}} | {{String}} | {{null}} | The JCE algorithm name indicating the Message Authentication algorithm. |
| {{shouldAppendHMAC}} | {{boolean}} | {{null}} | Flag indicating that a Message Authentication Code should be calculated and appended to the encrypted data.|
{div}
 



Basic Usage
At its most basic all that is required to encrypt/decrypt an exchange is a shared secret key. If one or more instances of the Crypto data format are configured with this key the format can be used to encrypt the payload in one route (or part of one) and decrypted in another. For example, using the Java DSL as follows:
...
PGPDataFormat Options



 Wiki Markup




 
{div:class=confluenceTableSmall}
|| Name || Type || Default || Description ||
| {{keyUserid}} | {{String}} | {{null}} | The user ID of the key in the PGP keyring used during encryption. See also option {{keyUserids}}. Can also be only a part of a user ID. For example, if the user ID is Test User t...@camel.com then you can use the part Test User or 

buildbot failure in ASF Buildbot on camel-site-production

2014-02-19 Thread buildbot
The Buildbot has detected a new failure on builder camel-site-production while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/camel-site-production/builds/16818

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

BUILD FAILED: failed compile

sincerely,
 -The Buildbot





git commit: CAMEL-7201 Aligned the class name accessor

2014-02-19 Thread ningjiang
Repository: camel
Updated Branches:
  refs/heads/master 667443aee - 5f9e4f23e


CAMEL-7201 Aligned the class name accessor


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5f9e4f23
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5f9e4f23
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5f9e4f23

Branch: refs/heads/master
Commit: 5f9e4f23e5b6c623a66fa81f0d42af7c85ae183c
Parents: 667443a
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed Feb 19 18:04:35 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Feb 19 19:00:51 2014 +0800

--
 .../crypto/DefaultPGPPublicKeyAccess.java   |  53 --
 .../crypto/DefaultPGPPublicKeyAccessor.java |  53 ++
 .../crypto/DefaultPGPSecretKeyAccess.java   | 100 ---
 .../crypto/DefaultPGPSecretKeyAccessor.java | 100 +++
 .../camel/converter/crypto/PGPDataFormat.java   |  10 +-
 .../crypto/PGPKeyAccessDataFormat.java  |  34 +++
 .../converter/crypto/PGPPublicKeyAccess.java|  50 --
 .../converter/crypto/PGPPublicKeyAccessor.java  |  50 ++
 .../converter/crypto/PGPSecretKeyAccess.java|  55 --
 .../converter/crypto/PGPSecretKeyAccessor.java  |  55 ++
 .../converter/crypto/PGPDataFormatTest.java |  12 +--
 .../crypto/PGPKeyAccessDataFormatTest.java  |   8 +-
 12 files changed, 290 insertions(+), 290 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5f9e4f23/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccess.java
--
diff --git 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccess.java
 
b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccess.java
deleted file mode 100644
index 5017732..000
--- 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccess.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * 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.converter.crypto;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.util.ObjectHelper;
-import org.bouncycastle.openpgp.PGPException;
-import org.bouncycastle.openpgp.PGPPublicKey;
-import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
-import org.bouncycastle.openpgp.PGPUtil;
-
-/**
- * Caches a public key ring.
- * 
- */
-public class DefaultPGPPublicKeyAccess implements PGPPublicKeyAccess {
-
-private final PGPPublicKeyRingCollection pgpPublicKeyRing;
-
-public DefaultPGPPublicKeyAccess(byte[] publicKeyRing) throws IOException, 
PGPException {
-ObjectHelper.notNull(publicKeyRing, publicKeyRing);
-pgpPublicKeyRing = new 
PGPPublicKeyRingCollection(PGPUtil.getDecoderStream(new 
ByteArrayInputStream(publicKeyRing)));
-}
-
-@Override
-public ListPGPPublicKey getEncryptionKeys(Exchange exchange, 
ListString useridParts) throws Exception {
-return PGPDataFormatUtil.findPublicKeys(useridParts, true, 
pgpPublicKeyRing);
-}
-
-@Override
-public PGPPublicKey getPublicKey(Exchange exchange, long keyId) throws 
Exception {
-return pgpPublicKeyRing.getPublicKey(keyId);
-}
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/5f9e4f23/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java
--
diff --git 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java
 
b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java
new file mode 100644
index 000..55b8b72
--- /dev/null
+++ 

buildbot success in ASF Buildbot on camel-site-production

2014-02-19 Thread buildbot
The Buildbot has detected a restored build on builder camel-site-production 
while building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/camel-site-production/builds/16819

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'camel-site-production' triggered 
this build
Build Source Stamp: [branch camel/website] HEAD
Blamelist: 

Build succeeded!

sincerely,
 -The Buildbot





svn commit: r898476 [3/3] - in /websites/production/camel/content: book-dataformat-appendix.html book-in-one-page.html cache/main.pageCache crypto.html

2014-02-19 Thread buildbot
Modified: websites/production/camel/content/crypto.html
==
--- websites/production/camel/content/crypto.html (original)
+++ websites/production/camel/content/crypto.html Wed Feb 19 11:19:47 2014
@@ -86,9 +86,8 @@
tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontenth2 
id=Crypto-CryptoCrypto/h2pstrongAvailable as of Camel 2.3/strongbr 
clear=none strongPGP Available as of Camel 2.9/strong/ppThe Crypto 
a shape=rect href=data-format.htmlData Format/a integrates the Java 
Cryptographic Extension into Camel, allowing simple and flexible encryption and 
decryption of messages using Camel's familiar marshall and unmarshal formatting 
mechanism. It assumes marshalling to mean encryption to cyphertext and 
unmarshalling to mean decryption back to the original plaintext. This data 
format implements only symmetric (shared-key) encryption and decyption./ph3 
id=Crypto-OptionsOptions/h3div class=confluenceTableSmall
-table class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceThp Name /p/thth colspan=1 rowspan=1 
class=confluenceThp Type /p/thth colspan=1 rowspan=1 
class=confluenceThp Default /p/thth colspan=1 rowspan=1 
class=confluenceThp Description /p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdp codealgorithm/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp codeString/code 
/p/tdtd colspan=1 rowspan=1 class=confluenceTdp 
codeDES/CBC/PKCS5Padding/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp The JCE algorithm name indicating the cryptographic 
algorithm that will be used. /p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdp codealgorithmParameterSpec/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp 
codejava.security.spec.AlgorithmParameterSpec/code /p/tdtd colspan=1 
rowspan=1 class=con
 fluenceTdp codenull/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdpA JCE AlgorithmParameterSpec used to initialize the 
Cipher. /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp 
codebufferSize/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp codeInteger/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp code2048/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp the size of the buffer used in the 
signature process. /p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdp codecryptoProvider/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp codeString/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp codenull/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp The name of the JCE Security 
Provider that should be used. /p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdp codeinitializa
 tionVector/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp codebyte[]/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp codenull/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp A byte array containing the Initialization 
Vector that will be used to initialize the Cipher. /p/td/trtrtd 
colspan=1 rowspan=1 class=confluenceTdp codeinline/code 
/p/tdtd colspan=1 rowspan=1 class=confluenceTdp 
codeboolean/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp codefalse/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp Flag indicating that the configured IV 
should be inlined into the encrypted data stream. /p/td/trtrtd 
colspan=1 rowspan=1 class=confluenceTdp codemacAlgorithm/code 
/p/tdtd colspan=1 rowspan=1 class=confluenceTdp 
codeString/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp codenull/co
 de /p/tdtd colspan=1 rowspan=1 class=confluenceTdp The JCE 
algorithm name indicating the Message Authentication algorithm. 
/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp 
codeshouldAppendHMAC/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp codeboolean/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp codenull/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp Flag indicating that a Message 
Authentication Code should be calculated and appended to the encrypted 
data./p/td/tr/tbody/table
-/divh3 id=Crypto-BasicUsageBasic Usage/h3pAt its most basic all that 
is required to encrypt/decrypt an exchange is a shared secret key. If one or 
more instances of the Crypto data format are configured with this key the 
format can be used to encrypt the payload in one route (or part of one) and 
decrypted in another. For example, using the Java DSL as follows:/pdiv 
class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
+div class=wiki-content maincontenth2 
id=Crypto-CryptoCrypto/h2pstrongAvailable as of Camel 2.3/strongbr 
clear=none strongPGP Available as of Camel 2.9/strong/ppThe Crypto 
a shape=rect href=data-format.htmlData Format/a integrates the Java 
Cryptographic Extension into Camel, allowing simple and flexible encryption and 
decryption of messages using Camel's familiar marshall and unmarshal formatting 
mechanism. It assumes marshalling to mean encryption to cyphertext and 
unmarshalling to mean 

svn commit: r898476 [1/3] - in /websites/production/camel/content: book-dataformat-appendix.html book-in-one-page.html cache/main.pageCache crypto.html

2014-02-19 Thread buildbot
Author: buildbot
Date: Wed Feb 19 11:19:47 2014
New Revision: 898476

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-dataformat-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/crypto.html

Modified: websites/production/camel/content/book-dataformat-appendix.html
==
--- websites/production/camel/content/book-dataformat-appendix.html (original)
+++ websites/production/camel/content/book-dataformat-appendix.html Wed Feb 19 
11:19:47 2014
@@ -3425,9 +3425,8 @@ from(quot;jms://queue:customerServiceQu
 lt;/dependencygt;
 ]]/script
 /div/div
-h2 id=BookDataFormatAppendix-CryptoCrypto/h2pstrongAvailable as of 
Camel 2.3/strongbr clear=none strongPGP Available as of Camel 
2.9/strong/ppThe Crypto a shape=rect href=data-format.htmlData 
Format/a integrates the Java Cryptographic Extension into Camel, allowing 
simple and flexible encryption and decryption of messages using Camel's 
familiar marshall and unmarshal formatting mechanism. It assumes marshalling to 
mean encryption to cyphertext and unmarshalling to mean decryption back to the 
original plaintext. This data format implements only symmetric (shared-key) 
encryption and decyption./ph3 
id=BookDataFormatAppendix-Options.6Options/h3div 
class=confluenceTableSmall
-table class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceThp Name /p/thth colspan=1 rowspan=1 
class=confluenceThp Type /p/thth colspan=1 rowspan=1 
class=confluenceThp Default /p/thth colspan=1 rowspan=1 
class=confluenceThp Description /p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdp codealgorithm/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp codeString/code 
/p/tdtd colspan=1 rowspan=1 class=confluenceTdp 
codeDES/CBC/PKCS5Padding/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp The JCE algorithm name indicating the cryptographic 
algorithm that will be used. /p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdp codealgorithmParameterSpec/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp 
codejava.security.spec.AlgorithmParameterSpec/code /p/tdtd colspan=1 
rowspan=1 class=con
 fluenceTdp codenull/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdpA JCE AlgorithmParameterSpec used to initialize the 
Cipher. /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp 
codebufferSize/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp codeInteger/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp code2048/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp the size of the buffer used in the 
signature process. /p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdp codecryptoProvider/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp codeString/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp codenull/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp The name of the JCE Security 
Provider that should be used. /p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdp codeinitializa
 tionVector/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp codebyte[]/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp codenull/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp A byte array containing the Initialization 
Vector that will be used to initialize the Cipher. /p/td/trtrtd 
colspan=1 rowspan=1 class=confluenceTdp codeinline/code 
/p/tdtd colspan=1 rowspan=1 class=confluenceTdp 
codeboolean/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp codefalse/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp Flag indicating that the configured IV 
should be inlined into the encrypted data stream. /p/td/trtrtd 
colspan=1 rowspan=1 class=confluenceTdp codemacAlgorithm/code 
/p/tdtd colspan=1 rowspan=1 class=confluenceTdp 
codeString/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp codenull/co
 de /p/tdtd colspan=1 rowspan=1 class=confluenceTdp The JCE 
algorithm name indicating the Message Authentication algorithm. 
/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp 
codeshouldAppendHMAC/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp codeboolean/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp codenull/code /p/tdtd colspan=1 
rowspan=1 class=confluenceTdp Flag indicating that a Message 
Authentication Code should be calculated and appended to the encrypted 
data./p/td/tr/tbody/table
-/divh3 id=BookDataFormatAppendix-BasicUsageBasic Usage/h3pAt its 
most basic all that is required to encrypt/decrypt an exchange is a shared 
secret key. If one or more instances of the Crypto data format are configured 
with this key the format can be used to encrypt the payload in one route (or 
part of one) and decrypted in another. For example, using the Java DSL as 
follows:/pdiv class=code panel pdl style=border-width: 1px;div 
class=codeContent panelContent pdl
+h2 

[CONF] Apache Camel Blueprint Testing

2014-02-19 Thread Henryk Konsek (Confluence)














  


Henryk Konsek edited the page:
 


Blueprint Testing   




 Comment: Added section about classpath scanning. 


...
In order to define blueprint tests, add the following dependency in your pom:



 Code Block









xml


 




 

dependency
  groupIdorg.apache.camel/groupId
  artifactIdcamel-test-blueprint/artifactId
  version2.10/version
  scopetest/scope
/dependency
 



 Classpath scanning 
 By default PojoSR test container scans the test classpath for all the OSGi bundles available there. All the bundles with Blueprint descriptor files will be automatically started by the test container. If you would like to prevent particular bundles from being started by the test container, override the getBundleFilter method, just as demonstrated on the snippet below. 



 Code Block









xml


 



   

[CONF] Apache Camel Blueprint Testing

2014-02-19 Thread Henryk Konsek (Confluence)














  


Henryk Konsek edited the page:
 


Blueprint Testing   




 Comment: Added syntax highlighting. 


...
By default PojoSR test container scans the test classpath for all the OSGi bundles available there. All the bundles with Blueprint descriptor files will be automatically started by the test container. If you would like to prevent particular bundles from being started by the test container, override the getBundleFilter method, just as demonstrated on the snippet below.



 Code Block




 xml



language
java


 




 @Override
protected String getBundleFilter() {
  // I don't want test container to scan and load Logback bundle during the test
  return (!(Bundle-SymbolicName=ch.qos.logback.core));
}
 



...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software  






svn commit: r898508 - in /websites/production/camel/content: blueprint-testing.html cache/main.pageCache

2014-02-19 Thread buildbot
Author: buildbot
Date: Wed Feb 19 13:19:36 2014
New Revision: 898508

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/blueprint-testing.html
websites/production/camel/content/cache/main.pageCache

Modified: websites/production/camel/content/blueprint-testing.html
==
--- websites/production/camel/content/blueprint-testing.html (original)
+++ websites/production/camel/content/blueprint-testing.html Wed Feb 19 
13:19:36 2014
@@ -86,12 +86,7 @@
tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontenth2 
id=BlueprintTesting-BlueprintTestingBlueprint Testing/h2
-pstrongAvailable as of Camel 2.10/strong/p
-
-pa shape=rect href=testing.htmlTesting/a is a crucial part of any 
development or integration work.  Camel supports the definition of a 
shape=rect href=using-osgi-blueprint-with-camel.htmlBlueprint routes/a, 
but given Blueprint is an OSGi specific technology, writing unit tests is quite 
difficult.  This library leverages a shape=rect class=external-link 
href=http://code.google.com/p/pojosr/; rel=nofollowPojoSR/a which 
provides a service registry without using a fully compliant OSGi container.  
This allows defining real unit tests (as opposed to integration tests using a 
shape=rect class=external-link 
href=http://team.ops4j.org/wiki/display/paxexam/Pax+Exam; rel=nofollowPax 
Exam/a. Please make sure all test jars in you class path are OSGi bundle./p
-
-div class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
+div class=wiki-content maincontenth2 
id=BlueprintTesting-BlueprintTestingBlueprint 
Testing/h2pstrongAvailable as of Camel 2.10/strong/ppa 
shape=rect href=testing.htmlTesting/a is a crucial part of any 
development or integration work. Camel supports the definition of a 
shape=rect href=using-osgi-blueprint-with-camel.htmlBlueprint routes/a, 
but given Blueprint is an OSGi specific technology, writing unit tests is quite 
difficult. This library leverages a shape=rect class=external-link 
href=http://code.google.com/p/pojosr/; rel=nofollowPojoSR/a which 
provides a service registry without using a fully compliant OSGi container. 
This allows defining real unit tests (as opposed to integration tests using a 
shape=rect class=external-link 
href=http://team.ops4j.org/wiki/display/paxexam/Pax+Exam; rel=nofollowPax 
Exam/a. Please make sure all test jars in you class path are OSGi 
bundle./pdiv class=code panel pdl style=border-width: 
 1px;div class=codeContent panelContent pdl
 script class=theme: Default; brush: java; gutter: false 
type=syntaxhighlighter![CDATA[
 // to use camel-test-blueprint, then extend the CamelBlueprintTestSupport 
class,
 // and add your unit tests methods as shown below.
@@ -143,13 +138,7 @@ public class DebugBlueprintTest extends 
 }
 }
 ]]/script
-/div/div
-
-pAlso notice the use of strongcodegetBlueprintDescriptor/code/strong 
to specify the location of the OSGi Blueprint XML file.br clear=none
-If you have multiple OSGi Blueprint XML files, then you can specify them with 
a comma-separated list in the 
strongcodegetBlueprintDescriptor/code/strong method./p
-
-pHere's the a shape=rect class=external-link 
href=http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml?view=markup;Blueprint
 XML file/a: /p
-div class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
+/div/divpAlso notice the use of 
strongcodegetBlueprintDescriptor/code/strong to specify the location of 
the OSGi Blueprint XML file.br clear=none If you have multiple OSGi 
Blueprint XML files, then you can specify them with a comma-separated list in 
the strongcodegetBlueprintDescriptor/code/strong method./ppHere's 
the a shape=rect class=external-link 
href=http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml?view=markup;Blueprint
 XML file/a:/pdiv class=code panel pdl style=border-width: 1px;div 
class=codeContent panelContent pdl
 script class=theme: Default; brush: xml; gutter: false 
type=syntaxhighlighter![CDATA[
 lt;blueprint xmlns=quot;http://www.osgi.org/xmlns/blueprint/v1.0.0quot;
xmlns:xsi=quot;http://www.w3.org/2001/XMLSchema-instancequot;
@@ -170,78 +159,45 @@ If you have multiple OSGi Blueprint XML 
 
 lt;/blueprintgt;
 ]]/script
-/div/div
-
-pIn order to define blueprint tests, add the following dependency in your 
pom:/p
-div class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
-script class=theme: Default; brush: xml; gutter: false 
type=syntaxhighlighter![CDATA[
-lt;dependencygt;
+/div/divpIn order to define blueprint tests, add the following 
dependency in your pom:/pdiv class=code panel pdl style=border-width: 
1px;div class=codeContent 

svn commit: r898513 - in /websites/production/camel/content: cache/main.pageCache jpa.html

2014-02-19 Thread buildbot
Author: buildbot
Date: Wed Feb 19 14:19:21 2014
New Revision: 898513

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/jpa.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/jpa.html
==
--- websites/production/camel/content/jpa.html (original)
+++ websites/production/camel/content/jpa.html Wed Feb 19 14:19:21 2014
@@ -86,140 +86,51 @@
tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontenth2 id=JPA-JPAComponentJPA 
Component/h2
-
-pThe strongjpa/strong component enables you to store and retrieve Java 
objects from persistent storage using EJB 3's Java Persistence Architecture 
(JPA), which is a standard interface layer that wraps Object/Relational Mapping 
(ORM) products such as OpenJPA, Hibernate, TopLink, and so on./p
-
-pMaven users will need to add the following dependency to their 
codepom.xml/code for this component:/p
-div class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
-script class=theme: Default; brush: xml; gutter: false 
type=syntaxhighlighter![CDATA[
-lt;dependencygt;
+div class=wiki-content maincontenth2 id=JPA-JPAComponentJPA 
Component/h2pThe strongjpa/strong component enables you to store and 
retrieve Java objects from persistent storage using EJB 3's Java Persistence 
Architecture (JPA), which is a standard interface layer that wraps 
Object/Relational Mapping (ORM) products such as OpenJPA, Hibernate, TopLink, 
and so on./ppMaven users will need to add the following dependency to their 
codepom.xml/code for this component:/pdiv class=code panel pdl 
style=border-width: 1px;div class=codeContent panelContent pdl
+script class=theme: Default; brush: xml; gutter: false 
type=syntaxhighlighter![CDATA[lt;dependencygt;
 lt;groupIdgt;org.apache.camellt;/groupIdgt;
 lt;artifactIdgt;camel-jpalt;/artifactIdgt;
 lt;versiongt;x.x.xlt;/versiongt;
 lt;!-- use the same version as your Camel core version --gt;
 lt;/dependencygt;
 ]]/script
-/div/div
-
-h3 id=JPA-SendingtotheendpointSending to the endpoint/h3
-
-pYou can store a Java entity bean in a database by sending it to a JPA 
producer endpoint. The body of the emIn/em message is assumed to be an 
entity bean (that is, a POJO with an a shape=rect class=external-link 
href=http://java.sun.com/javaee/5/docs/api/javax/persistence/Entity.html; 
rel=nofollow@Entity/a annotation on it) or a collection or array of entity 
beans. /p
-
-pIf the body does not contain one of the previous listed types, put a a 
shape=rect href=message-translator.htmlMessage Translator/a in front of 
the endpoint to perform the necessary conversion first./p
-
-h3 id=JPA-ConsumingfromtheendpointConsuming from the endpoint/h3
-
-pConsuming messages from a JPA consumer endpoint removes (or updates) entity 
beans in the database. This allows you to use a database table as a logical 
queue: consumers take messages from the queue and then delete/update them to 
logically remove them from the queue./p
-
-pIf you do not wish to delete the entity bean when it has been processed 
(and when routing is done), you can specify codeconsumeDelete=false/code on 
the URI. This will result in the entity being processed each poll./p
-
-pIf you would rather perform some update on the entity to mark it as 
processed (such as to exclude it from a future query) then you can annotate a 
method with a shape=rect class=external-link 
href=http://camel.apache.org/maven/current/camel-jpa/apidocs/org/apache/camel/component/jpa/Consumed.html;@Consumed/a
 which will be invoked on your entity bean when the entity bean when it has 
been processed (and when routing is done)./p
-
-pFrom strongCamel 2.13/strong onwards you can use a shape=rect 
class=external-link 
href=http://camel.apache.org/maven/current/camel-jpa/apidocs/org/apache/camel/component/jpa/PreConsumed.html;@PreConsumed/a
 which will be invoked on your entity bean before it has been processed (before 
routing)./p
-
-h3 id=JPA-URIformatURI format/h3
-
-div class=code panel pdl style=border-width: 1px;div class=codeContent 
panelContent pdl
-script class=theme: Default; brush: java; gutter: false 
type=syntaxhighlighter![CDATA[
-jpa:entityClassName[?options]
+/div/divh3 id=JPA-SendingtotheendpointSending to the 
endpoint/h3pYou can store a Java entity bean in a database by sending it to 
a JPA producer endpoint. The body of the emIn/em message is assumed to be 
an entity bean (that is, a POJO with an a shape=rect class=external-link 
href=http://java.sun.com/javaee/5/docs/api/javax/persistence/Entity.html; 
rel=nofollow@Entity/a annotation on it) or a collection or array of entity 
beans./ppIf the body does 

git commit: Update jline version

2014-02-19 Thread janstey
Repository: camel
Updated Branches:
  refs/heads/master 5f9e4f23e - a79b15971


Update jline version


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a79b1597
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a79b1597
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a79b1597

Branch: refs/heads/master
Commit: a79b159710debe5ed0517c434421e71f0f521257
Parents: 5f9e4f2
Author: Jonathan Anstey jans...@gmail.com
Authored: Wed Feb 19 13:24:46 2014 -0330
Committer: Jonathan Anstey jans...@gmail.com
Committed: Wed Feb 19 13:24:46 2014 -0330

--
 components/camel-web/pom.xml | 2 +-
 parent/pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a79b1597/components/camel-web/pom.xml
--
diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml
index f56773c..1c0ff6f 100644
--- a/components/camel-web/pom.xml
+++ b/components/camel-web/pom.xml
@@ -592,7 +592,7 @@
 osgi.classpath
 .,
 WEB-INF/classes,
-WEB-INF/lib/jline-0.9.94.jar,
+WEB-INF/lib/jline-${jline-version}.jar,
 WEB-INF/lib/jersey-core-${jersey-version}.jar,
 WEB-INF/lib/jersey-server-${jersey-version}.jar,
 WEB-INF/lib/jersey-spring-${jersey-version}.jar,

http://git-wip-us.apache.org/repos/asf/camel/blob/a79b1597/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index fbc59e3..d99595b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -227,7 +227,7 @@
 jibx-version1.2.5/jibx-version
 jing-bundle-version20030619_5/jing-bundle-version
 jing-version20030619/jing-version
-jline-version0.9.94/jline-version
+jline-version2.11/jline-version
 jmockit-version1.5/jmockit-version
 jodatime-bundle-version1.6.2/jodatime-bundle-version
 jodatime2-bundle-version2.3/jodatime2-bundle-version



git commit: Update jline version

2014-02-19 Thread janstey
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 0a5fffbd1 - a0ec08e1c


Update jline version


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a0ec08e1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a0ec08e1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a0ec08e1

Branch: refs/heads/camel-2.12.x
Commit: a0ec08e1cc7f300ecea84af2039979806090a498
Parents: 0a5fffb
Author: Jonathan Anstey jans...@gmail.com
Authored: Wed Feb 19 13:24:46 2014 -0330
Committer: Jonathan Anstey jans...@gmail.com
Committed: Wed Feb 19 13:25:04 2014 -0330

--
 components/camel-web/pom.xml | 2 +-
 parent/pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a0ec08e1/components/camel-web/pom.xml
--
diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml
index 2d684eb..b19b5a0 100644
--- a/components/camel-web/pom.xml
+++ b/components/camel-web/pom.xml
@@ -592,7 +592,7 @@
 osgi.classpath
 .,
 WEB-INF/classes,
-WEB-INF/lib/jline-0.9.94.jar,
+WEB-INF/lib/jline-${jline-version}.jar,
 WEB-INF/lib/jersey-core-${jersey-version}.jar,
 WEB-INF/lib/jersey-server-${jersey-version}.jar,
 WEB-INF/lib/jersey-spring-${jersey-version}.jar,

http://git-wip-us.apache.org/repos/asf/camel/blob/a0ec08e1/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 743f445..c8a18a9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -224,7 +224,7 @@
 jibx-version1.2.5/jibx-version
 jing-bundle-version20030619_5/jing-bundle-version
 jing-version20030619/jing-version
-jline-version0.9.94/jline-version
+jline-version2.11/jline-version
 jmockit-version1.5/jmockit-version
 jodatime-bundle-version1.6.2/jodatime-bundle-version
 jodatime2-bundle-version2.1/jodatime2-bundle-version



[CONF] Apache Camel Camel 2.13.0 Release

2014-02-19 Thread Henryk Konsek (Confluence)














  


Henryk Konsek edited the page:
 


Camel 2.13.0 Release   




 Comment: Added CAMEL-7212 information. 


...

The MBean names registered by Camel JMX no longer include the hostname in the context part, eg before context=myHost/myCamelId and now after context=myCamelId. Having the hostname in the MBean name does not bring much value, and in fact makes things more complicated as the mbean name changes depending on the host running Camel.
 MBean naming in OSGi cleaned up to use simpler naming with symbolicName. Before we could have MBean names with duplicate bundle ids such as context=114-114-camel-6, which now is using the symbolic name instead, context=MyApplication.
When using multiple OSGi Blueprint cm:property-placeholder's then Camel now favors using non-default placeholders, or the last property-placeholder defined in the Blueprint XML file. This allows for example to define default properties in one placeholder, and override these values in other placeholders.
 FTP consumer allow to download a single named file without using the FTP LIST command. This allows to download a known file from a FTP server even when the user account does not have permission to do FTP LIST command.
 FTP consumer allow to ignore file not found or insufficient file permission errors.
 Data Format using marshal now leverages Stream caching out of the box if enabled, which allows to marshal big streams and spool to disk, instead of being pure in-memory based.
Improved using Bean when the bean is looked up in the Registry, when using concurrent processing in the route.
Added cache option to beanRef and bean in the DSL. This avoids looking up the Bean from the Registry on each usage; this can safely be done for singleton beans.
Configuring Data Formats in XML attributes now supports reference lookup using the # syntax, eg jaxb xmlStreamWriterWrapper=#myWriterWrapper .. 
 JDBC component now also support outputType to specify the expected output as either a List or single Object. As well allow to map to a bean using a BeanRowMapper to control the mapping of ROW names to bean properties.
Both Quartz as well as Quartz2 based ScheduledRoutePolicy has been improved to better support cluster setups (e.g. to not schedule jobs being already scheduled through another node inside a given cluster).
Reduced the work the Aggregate EIP does while holding a lock during aggregation, which can lead to improved performance in some use-cases.
 JndiRegistry now implements all the find methods.
 VM component now supports multipleConsumers=true across deployment units.
Added @PreConsumed to JPA consumer.
Added CamelFileName header support to the HDFS producer
Like as JpaConsumer now also JpaProducer of the JPA component supports the CamelEntityManager header.
 Restlet consumer now supports returning custom 

[CONF] Apache Camel Bean Validator

2014-02-19 Thread Henryk Konsek (Confluence)














  


Henryk Konsek edited the page:
 


Bean Validator   






 Bean  
...
 Validator Component 
 Available as of Camel 2.3 
The Validation Validator component performs bean validation of the message body using the Java Bean Validation API (JSR 303). Camel uses the reference implementation, which is Hibernate Validator.
...



 Code Block









xml


 




 dependency
groupIdorg.apache.camel/groupId
artifactIdcamel-bean-validator/artifactId
versionx.y.z/version
!-- use the same version as your Camel core version --
/dependency
 



 URI format 



 Code Block




 bean-validator:label[?options]
 



...
Where label is an arbitrary text value describing the endpoint. You can append query options to the URI in the following format, ?option=valueoption=value...
 URI Options 



 Wiki Markup



[CONF] Apache Camel Bean Validator

2014-02-19 Thread Henryk Konsek (Confluence)














  


Henryk Konsek edited the page:
 


Bean Validator   




 Comment: Added CAMEL-7212 information. 


...



 Wiki Markup




 {div:class=confluenceTableSmall}
|| Option || Default || Description ||
| {{group}} | {{javax.validation.groups.Default}} | The custom validation group to use. |
| {{validationProviderResolver}} | Depends on JSR303 jar provided. | Camel *2.13.0*: Reference to a custom {{javax.validation.ValidationProviderResolver}} in the [Registry]. |
| {{messageInterpolator}} | {{org.hibernate.validator.engine.\\ResourceBundleMessageInterpolator}} | Reference to a custom {{javax.validation.MessageInterpolator}} in the [Registry]. |
| {{traversableResolver}} | {{org.hibernate.validator.engine.resolver.\\DefaultTraversableResolver}} | Reference to a custom {{javax.validation.TraversableResolver}} in the [Registry]. |
| {{constraintValidatorFactory}} | {{org.hibernate.validator.engine.\\ConstraintValidatorFactoryImpl}} | Reference to a custom {{javax.validation.ConstraintValidatorFactory}} in the [Registry]. |
{div} 



...
 OSGi  
...
 The bean-validator when deployed in an OSGi environment requires a little help to accommodate the resource loading specified in JSR303, this was fixed in Servicemix-Specs 1.6-SNAPSHOT. 
...
 deployment 
 To use Hibernate Validator in the OSGi environment is to use dedicated ValidationProviderResolver implementation, just as org.apache.camel.component.bean.validator.HibernateValidationProviderResolver. The snippet below demonstrates this approach. Keep in mind that you can use HibernateValidationProviderResolver starting from the Camel 2.13.0.



 Code Block








title
Using HibernateValidationProviderResolver


 
  

[CONF] Apache Camel File2

2014-02-19 Thread Claus Ibsen (Confluence)














  


Claus Ibsen edited the page:
 


File2   






...



 Wiki Markup




 {div:class=confluenceTableSmall}
|| Header || Description ||
| {{CamelFileName}} | Name of the consumed file as a relative file path with offset from the starting directory configured on the endpoint. |
| {{CamelFileNameOnly}} | Only the file name (the name with no leading paths). |
| {{CamelFileAbsolute}} | A {{boolean}} option specifying whether the consumed file denotes an absolute path or not. Should normally be {{false}} for relative paths. Absolute paths should normally not be used but we added to the move option to allow moving files to absolute paths. But can be used elsewhere as well. |
| {{CamelFileAbsolutePath}} | The absolute path to the file. For relative files this path holds the relative path instead. |
| {{CamelFilePath}} | The file path. For relative files this is the starting directory + the relative filename. For absolute files this is the absolute path. |
| {{CamelFileRelativePath}} | The relative path. |
| {{CamelFileParent}} | The parent path. |
| {{CamelFileLength}} | A {{long}} value containing the file size. |
| {{CamelFileLastModified}} | A {{DateLong}} value containing the last modified timestamp of the file. In *Camel 2.10.3 and older* the type is {{Date}}. |
{div} 



Batch Consumer
This component implements the Batch Consumer.
...






 View Online   Like   View Changes  
 Stop watching space   Manage Notifications  


 


 


  This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software  






svn commit: r898608 - in /websites/production/camel/content: cache/main.pageCache file2.html

2014-02-19 Thread buildbot
Author: buildbot
Date: Thu Feb 20 07:20:12 2014
New Revision: 898608

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/file2.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/file2.html
==
--- websites/production/camel/content/file2.html (original)
+++ websites/production/camel/content/file2.html Thu Feb 20 07:20:12 2014
@@ -138,7 +138,7 @@ Notice from strongCamel 2.10/strong 
 /div/divh4 id=File2-AboutmoveFailedAbout moveFailed/h4pThe 
codemoveFailed/code option allows you to move files that strongcould 
not/strong be processed succesfully to another location such as a error 
folder of your choice. For example to move the files in an error folder with a 
timestamp you can use 
codemoveFailed=/error/${/codecodefile:name.noext/codecode}-${date:now:MMddHHmmssSSS}.${/codecodefile:ext/code}./ppSee
 more examples at a shape=rect href=file-language.htmlFile 
Language/a/ph3 id=File2-MessageHeadersMessage Headers/h3pThe 
following headers are supported by this component:/ph4 
id=File2-FileproduceronlyFile producer only/h4div 
class=confluenceTableSmall
 table class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceThp Header /p/thth colspan=1 rowspan=1 
class=confluenceThp Description /p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdp codeCamelFileName/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp Specifies the name of the file 
to write (relative to the endpoint directory). The name can be a 
codeString/code; a codeString/code with a a shape=rect 
href=file-language.html title=File LanguageFile Language/a or a 
shape=rect href=simple.html title=SimpleSimple/a expression; or an a 
shape=rect href=expression.html title=ExpressionExpression/a object. 
If it's codenull/code then Camel will auto-generate a filename based on the 
message unique ID. /p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdp codeCamelFileNameProduced/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp The
  actual absolute filepath (path + name) for the output file that was written. 
This header is set by Camel and its purpose is providing end-users with the 
name of the file that was written. /p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdp codeCamelOverruleFileName/code 
/p/tdtd colspan=1 rowspan=1 class=confluenceTdp strongCamel 
2.11:/strong Is used for overruling codeCamelFileName/code header and use 
the value instead (but only once, as the producer will remove this header after 
writing the file). The value can be only be a String. Notice that if the option 
codefileName/code has been configured, then this is still being evaluated. 
/p/td/tr/tbody/table
 /divh4 id=File2-FileconsumeronlyFile consumer only/h4div 
class=confluenceTableSmall
-table class=confluenceTabletbodytrth colspan=1 rowspan=1 
class=confluenceThp Header /p/thth colspan=1 rowspan=1 
class=confluenceThp Description /p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdp codeCamelFileName/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp Name of the consumed file as a 
relative file path with offset from the starting directory configured on the 
endpoint. /p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdp codeCamelFileNameOnly/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp Only the file name (the name 
with no leading paths). /p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdp codeCamelFileAbsolute/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp A codeboolean/code option 
specifying whether the consumed file denotes an absolute path or not. Should 
normally be codefalse/code for relative paths. Abso
 lute paths should normally not be used but we added to the move option to 
allow moving files to absolute paths. But can be used elsewhere as well. 
/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp 
codeCamelFileAbsolutePath/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp The absolute path to the file. For relative files this 
path holds the relative path instead. /p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdp codeCamelFilePath/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp The file path. For relative 
files this is the starting directory + the relative filename. For absolute 
files this is the absolute path. /p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdp codeCamelFileRelativePath/code /p/tdtd 
colspan=1 rowspan=1 class=confluenceTdp The relative path. 
/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp 
codeCamelFileParent/code /p/
 tdtd colspan=1 rowspan=1 class=confluenceTdp The parent path. 
/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp 
codeCamelFileLength/code /p/tdtd colspan=1 rowspan=1 
class=confluenceTdp A 

git commit: Update pom.xml

2014-02-19 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/master a79b15971 - 2e0ced97f


Update pom.xml

Updated MyBatis version to 3.2.5

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e0ced97
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e0ced97
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e0ced97

Branch: refs/heads/master
Commit: 2e0ced97f94a08ac7cd76ee6a172255929569e7a
Parents: a79b159
Author: Eduardo Macarron eduardo.macar...@gmail.com
Authored: Thu Feb 20 04:59:52 2014 +0100
Committer: Eduardo Macarron eduardo.macar...@gmail.com
Committed: Thu Feb 20 04:59:52 2014 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2e0ced97/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index d99595b..0e60975 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -306,7 +306,7 @@
 mustache-java-version0.8.13/mustache-java-version
 mustache-bundle-version0.8.13_1//mustache-bundle-version
 mvel-version2.1.7.Final/mvel-version
-mybatis-version3.2.4/mybatis-version
+mybatis-version3.2.5/mybatis-version
 neethi-bundle-version3.0.1/neethi-bundle-version
 netty3-version3.8.0.Final/netty3-version
 netty-version4.0.8.Final/netty-version



git commit: Update pom.xml

2014-02-19 Thread davsclaus
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x a0ec08e1c - c471ae190


Update pom.xml

Updated MyBatis version to 3.2.5


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c471ae19
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c471ae19
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c471ae19

Branch: refs/heads/camel-2.12.x
Commit: c471ae190c5b66b0fa1f359477db753169d61903
Parents: a0ec08e
Author: Eduardo Macarron eduardo.macar...@gmail.com
Authored: Thu Feb 20 04:59:52 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Thu Feb 20 08:30:54 2014 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c471ae19/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index c8a18a9..c93f64b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -299,7 +299,7 @@
 mustache-java-version0.8.13/mustache-java-version
 mustache-bundle-version0.8.13_1//mustache-bundle-version
 mvel-version2.1.7.Final/mvel-version
-mybatis-version3.2.4/mybatis-version
+mybatis-version3.2.5/mybatis-version
 neethi-bundle-version3.0.1/neethi-bundle-version
 netty3-version3.8.0.Final/netty3-version
 netty-version4.0.8.Final/netty-version