[CONF] Apache Camel Quickfix
Grzegorz Grzybek edited the page: Quickfix ... Code Block quickfix:configFile[?sessionID=sessionIDlazyCreateEngine=true|false] The configFile is the name of the QuickFIX/J configuration to use for the FIX engine (located as a resource found in your classpath). The optional sessionID identifies a specific FIX session. The format of the sessionID is: Code Block (BeginString):(SenderCompID)[/(SenderSubID)[/(SenderLocationID)]]-(TargetCompID)[/(TargetSubID)[/(TargetLocationID)]] The optional lazyCreateEngine parameter allows to create QuickFIX/J engine on demand. Value true means the engine is started when first message is send or there's consumer configured in router definition. Whenfalse value is used, the engine is started at the endpoint creation. When this parameter is missing, the value of component's property lazyCreateEngines is being used. Example URIs: Code Block quickfix:config.cfg quickfix:config.cfg?sessionID=FIX.4.2:MyTradingCompany-SomeExchange quickfix:config.cfg?sessionID=FIX.4.2:MyTradingCompany-SomeExchangelazyCreateEngine=true Endpoints FIX sessions are endpoints for the quickfix component. An endpoint URI may specify a single session or all sessions managed by a specific QuickFIX/J engine. Typical applications will use only one FIX engine but advanced users may create multiple FIX engines by referencing different configuration files in quickfix component endpoint URIs. ...
[CONF] Apache Camel Quickfix
Grzegorz Grzybek edited the page: Quickfix ... The optional lazyCreateEngine (Camel 2.12.3+) parameter allows to create QuickFIX/J engine on demand. Value true means the engine is started when first message is send or there's consumer configured in route definition. Whenfalse value is used, the engine is started at the endpoint creation. When this parameter is missing, the value of component's property lazyCreateEngines is being used. ... 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: r898382 - in /websites/production/camel/content: cache/main.pageCache quickfix.html
Author: buildbot Date: Tue Feb 18 12:19:42 2014 New Revision: 898382 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/quickfix.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/quickfix.html == --- websites/production/camel/content/quickfix.html (original) +++ websites/production/camel/content/quickfix.html Tue Feb 18 12:19:42 2014 @@ -102,16 +102,17 @@ lt;/dependencygt; ]]/script /div/divh3 id=Quickfix-URIformatURI format/h3div class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl -script class=theme: Default; brush: java; gutter: false type=syntaxhighlighter![CDATA[quickfix:configFile[?sessionID=sessionID] +script class=theme: Default; brush: java; gutter: false type=syntaxhighlighter![CDATA[quickfix:configFile[?sessionID=sessionIDamp;lazyCreateEngine=true|false] ]]/script -/div/divpThe strongconfigFile/strong is the name of the QuickFIX/J configuration to use for the FIX engine (located as a resource found in your classpath). The optional sessionID identifies a specific FIX session. The format of the sessionID is:/pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl +/div/divpThe strongconfigFile/strong is the name of the QuickFIX/J configuration to use for the FIX engine (located as a resource found in your classpath). The optional strongsessionID/strong identifies a specific FIX session. The format of the sessionID is:/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[(BeginString):(SenderCompID)[/(SenderSubID)[/(SenderLocationID)]]-gt;(TargetCompID)[/(TargetSubID)[/(TargetLocationID)]] ]]/script -/div/divpExample URIs:/pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl +/div/divpThe optional stronglazyCreateEngine/strong (Camel 2.12.3+) parameter allows to create QuickFIX/J engine on demand. Value strongtrue/strong means the engine is started when first message is send or there's consumer configured in route definition. When#160;strongfalse/strong value is used, the engine is started at the endpoint creation. When this parameter is missing, the value of component's property stronglazyCreateEngines/strong is being used./ppExample URIs:/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[quickfix:config.cfg quickfix:config.cfg?sessionID=FIX.4.2:MyTradingCompany-gt;SomeExchange -]]/script + +quickfix:config.cfg?sessionID=FIX.4.2:MyTradingCompany-gt;SomeExchangeamp;lazyCreateEngine=true]]/script /div/divh2 id=Quickfix-EndpointsEndpoints/h2pFIX sessions are endpoints for the strongquickfix/strong component. An endpoint URI may specify a single session or all sessions managed by a specific QuickFIX/J engine. Typical applications will use only one FIX engine but advanced users may create multiple FIX engines by referencing different configuration files in strongquickfix/strong component endpoint URIs./ppWhen a consumer does not include a session ID in the endpoint URI, it will receive exchanges for all sessions managed by the FIX engine associated with the configuration file specified in the URI. If a producer does not specify a session in the endpoint URI then it must include the session-related fields in the FIX message being sent. If a session is specified in the URI then the component will automatically inject the session-related fields into the FIX message./ph3 id=Quickfix-ExchangeFormatExchange Format/h3pThe exchange headers include info rmation to help with exchange filtering, routing and other processing. The following headers are available:/pdiv class=confluenceTableSmall table class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceThp Header Name /p/thth colspan=1 rowspan=1 class=confluenceThp Description /p/th/trtrtd colspan=1 rowspan=1 class=confluenceTdp EventCategory /p/tdtd colspan=1 rowspan=1 class=confluenceTdp One of codeAppMessageReceived/code, codeAppMessageSent/code, codeAdminMessageReceived/code, codeAdminMessageSent/code, codeSessionCreated/code, codeSessionLogon/code, codeSessionLogoff/code. See the codeQuickfixjEventCategory/code enum. /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp SessionID /p/tdtd colspan=1 rowspan=1 class=confluenceTdp The FIX message SessionID /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp MessageType /p/tdtd colspan=1 rowspan=1 class=confluenceTdp The FIX MsgType tag value
[CONF] Apache Camel Camel 2.13.0 Release
Henryk Konsek edited the page: Camel 2.13.0 Release Comment: Classmate version update information ... AHC 1.7.20 to 1.7.21 APNS 0.1.6 to 0.2.3 Atomikos 3.8.0 to 3.9.2 AWS-SDK 1.5.1 to 1.6.3 Avro 1.7.3 to 1.7.5 BeanIO 2.0.6 to 2.0.7 Classmate from 0.8.0 to 1.0.0 Commons Httpclient 4.2.5 to 4.3.1 Commons Httpcore 4.2.4 to 4.3.1 CXF 2.7.6 to 2.7.10 EHCache 2.7.2 to 2.8.0 Elasticsearch 0.20.6 to 0.90.5 FOP 1.0 to 1.1 Guave 14.0.1 to 15.0 Hazelcast 2.6 to 3.0.2 Hibernate Validator 5.0.1.Final to 5.0.3.Final ICal4j 1.0.4 to 1.0.5.2 Jclouds 1.6.2-incubating to 1.7.0 Jettison 1.3.4 to 1.3.5 Jetty 7.6.9 to 8.1.12 Joda time 2.1 to 2.3 JRuby 1.7.4 to 1.7.5 JSCH 0.1.49 to 0.1.50 Lucene 3.6.0 to 4.5.1 MongoDB Java Driver 2.11.2 to 2.11.3 MyBatis 3.2.2 to 3.2.4 OGNL 3.0.6 to 3.0.8 Quartz 2.2.0 to 2.2.1 RabbitMQ amqp Java Client 3.1.3 to 3.2.2. Restlet 2.0.15 to 2.1.4 Saxon 9.5.0.2 to 9.5.1-2 Scala 2.10.2 to 2.10.3 Servlet API 2.5 to 3.0 SNMP4J 2.2.2 to 2.2.3 SolrJ 3.6.2 to 4.5.1 Spring Batch 2.2.1.RELEASE to 2.2.2.RELEASE Spring Redis 1.0.4.RELEASE to 1.1.0.RELEASE SSHD 0.8.0 to 0.9.0 TestNG 6.8.5 to 6.8.7 XStream 1.4.4 to 1.4.5 ...
git commit: CAMEL-7207 CxfRsEndpoint should accept in/out interceptors and properties with thanks to Sergey
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x fa07991fe - 73c31fb98
CAMEL-7207 CxfRsEndpoint should accept in/out interceptors and properties with
thanks to Sergey
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/73c31fb9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/73c31fb9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/73c31fb9
Branch: refs/heads/camel-2.12.x
Commit: 73c31fb98041b41817738ee3a6eed6bad464eae6
Parents: fa07991
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue Feb 18 20:40:51 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue Feb 18 20:45:05 2014 +0800
--
.../component/cxf/jaxrs/CxfRsEndpoint.java | 101 +++
.../cxf/jaxrs/CxfRsEndpointWithProperties.java | 12 +++
.../cxf/jaxrs/CxfRsSpringEndpointTest.java | 9 ++
.../cxf/jaxrs/CxfRsEndpointWithProperties.xml | 3 +
.../cxf/jaxrs/CxfRsSpringEndpointBeans-2.6.xml | 3 +
5 files changed, 109 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/73c31fb9/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 242c027..625643b 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -42,9 +42,13 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
import org.apache.cxf.feature.Feature;
import org.apache.cxf.feature.LoggingFeature;
+import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
+import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.logging.FaultListener;
+import org.apache.cxf.message.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -92,7 +96,8 @@ public class CxfRsEndpoint extends DefaultEndpoint implements
HeaderFilterStrate
private boolean isSetDefaultBus;
private ListFeature features = new
ModCountCopyOnWriteArrayListFeature();
-
+private InterceptorHolder interceptorHolder = new InterceptorHolder();
+private MapString, Object properties;
@Deprecated
@@ -192,16 +197,7 @@ public class CxfRsEndpoint extends DefaultEndpoint
implements HeaderFilterStrate
}
sfb.setResourceClasses(res);
}
-// let customer to override the default setting of provider
-if (!getProviders().isEmpty()) {
-sfb.setProviders(getProviders());
-}
-// setup the features
-if (!getFeatures().isEmpty()) {
-for (Feature feature : getFeatures()) {
-sfb.getFeatures().add(feature);
-}
-}
+setupCommonFactoryProperties(sfb);
sfb.setStart(false);
}
@@ -214,28 +210,48 @@ public class CxfRsEndpoint extends DefaultEndpoint
implements HeaderFilterStrate
cfb.setResourceClass(getResourceClasses().get(0));
cfb.getServiceFactory().setResourceClasses(getResourceClasses());
}
+setupCommonFactoryProperties(cfb);
+cfb.setThreadSafe(true);
+}
+
+protected void setupCommonFactoryProperties(AbstractJAXRSFactoryBean
factory) {
// let customer to override the default setting of provider
if (!getProviders().isEmpty()) {
-cfb.setProviders(getProviders());
+factory.setProviders(getProviders());
}
// setup the features
if (!getFeatures().isEmpty()) {
-cfb.setFeatures(getFeatures());
+factory.getFeatures().addAll(getFeatures());
}
+
+factory.setInInterceptors(interceptorHolder.getInInterceptors());
+factory.setOutInterceptors(interceptorHolder.getOutInterceptors());
+
factory.setOutFaultInterceptors(interceptorHolder.getOutFaultInterceptors());
+
factory.setInFaultInterceptors(interceptorHolder.getInFaultInterceptors());
+
+if (getProperties() != null) {
+if (factory.getProperties() != null) {
+// add to existing properties
+factory.getProperties().putAll(getProperties());
+} else {
+factory.setProperties(getProperties());
+}
+
git commit: [CAMEL-7218] Extracted OSGi-detection logic into utility class.
Repository: camel
Updated Branches:
refs/heads/master ca480add1 - fc8a5ceba
[CAMEL-7218] Extracted OSGi-detection logic into utility class.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc8a5ceb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc8a5ceb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc8a5ceb
Branch: refs/heads/master
Commit: fc8a5ceba8f82675ef8290bdc489eba73a836e40
Parents: ca480ad
Author: Henryk Konsek hekon...@gmail.com
Authored: Tue Feb 18 16:54:26 2014 +0100
Committer: Henryk Konsek hekon...@gmail.com
Committed: Tue Feb 18 16:55:11 2014 +0100
--
.../org/apache/camel/util/PlatformHelper.java | 54
.../spring/handler/CamelNamespaceHandler.java | 24 -
2 files changed, 63 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fc8a5ceb/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
b/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
new file mode 100644
index 000..3fd0338
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
@@ -0,0 +1,54 @@
+/**
+ * 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.util;
+
+import java.lang.reflect.Method;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Utility dedicated for resolving runtime information related to the platform
on which Camel is currently running.
+ */
+public final class PlatformHelper {
+
+private static final Logger LOG =
LoggerFactory.getLogger(PlatformHelper.class);
+
+private PlatformHelper() {
+}
+
+/**
+ * Determine whether Camel is running in the OSGi environment. Current
implementation tries to load Camel activator
+ * bundle (using reflection API and class loading) to determine if the
code is executed in the OSGi environment.
+ *
+ * @return true if caller is running in the OSGi environment, false
otherwise
+ */
+public static boolean isInOsgiEnvironment() {
+try {
+// Try to load the BundleActivator first
+Class.forName(org.osgi.framework.BundleActivator);
+Class? activatorClass =
Class.forName(org.apache.camel.osgi.Activator);
+Method getBundleMethod =
activatorClass.getDeclaredMethod(getBundle);
+Object bundle = getBundleMethod.invoke(null);
+return bundle != null;
+} catch (Throwable t) {
+LOG.trace(Cannot find class so assuming not running in OSGi
container: + t.getMessage());
+return false;
+}
+}
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc8a5ceb/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 957c792..9a035c8 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,6 +51,7 @@ 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;
@@ -124,27 +125,20 @@ public class CamelNamespaceHandler extends
git commit: CAMEL-7216 - upgrade to xstream 1.4.7
Repository: camel Updated Branches: refs/heads/camel-2.12.x 73c31fb98 - f02b9bec7 CAMEL-7216 - upgrade to xstream 1.4.7 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f02b9bec Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f02b9bec Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f02b9bec Branch: refs/heads/camel-2.12.x Commit: f02b9bec77e27cff9c628d49736cd3ae0f307b80 Parents: 73c31fb Author: Jonathan Anstey jans...@gmail.com Authored: Mon Feb 17 15:21:08 2014 -0330 Committer: Jonathan Anstey jans...@gmail.com Committed: Tue Feb 18 13:13:51 2014 -0330 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f02b9bec/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 8590139..743f445 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -428,8 +428,8 @@ xpp3-bundle-version1.1.4c_6/xpp3-bundle-version xpp3-version1.1.4c/xpp3-version xsdlib-version2013.2/xsdlib-version -xstream-bundle-version1.4.5_1/xstream-bundle-version -xstream-version1.4.5/xstream-version +xstream-bundle-version1.4.7_1/xstream-bundle-version +xstream-version1.4.7/xstream-version xom-version1.2.5/xom-version zookeeper-version3.4.5/zookeeper-version
[5/5] git commit: CAMEL-7219: Fixed language component to be able to load resources from classpath.
CAMEL-7219: Fixed language component to be able to load resources from
classpath.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0c872dc0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0c872dc0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0c872dc0
Branch: refs/heads/camel-2.11.x
Commit: 0c872dc03b052352e8f3cbc1b034e7102f476f48
Parents: 827b0b0
Author: Claus Ibsen davscl...@apache.org
Authored: Tue Feb 18 17:54:22 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue Feb 18 18:36:01 2014 +0100
--
.../component/language/LanguageComponent.java | 4 ++
...geResourceLoadConstantFromClasspathTest.java | 46
.../apache/camel/component/language/hello.txt | 1 +
3 files changed, 51 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0c872dc0/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
index 2127256..07366db 100644
---
a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
@@ -57,9 +57,13 @@ public class LanguageComponent extends DefaultComponent {
if (ResourceHelper.hasScheme(resource)) {
// the script is a uri for a resource
resourceUri = resource;
+// then the script should be null
+script = null;
} else {
// the script is provided as text in the uri, so decode to
utf-8
script = URLDecoder.decode(script, UTF-8);
+// then the resource should be null
+resourceUri = null;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/0c872dc0/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
b/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
new file mode 100644
index 000..aa98835
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.language;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version
+ */
+public class LanguageResourceLoadConstantFromClasspathTest extends
ContextTestSupport {
+
+public void testLanguage() throws Exception {
+getMockEndpoint(mock:result).expectedBodiesReceived(Hello this is
some text.);
+
+template.sendBody(direct:start, World);
+
+assertMockEndpointsSatisfied();
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from(direct:start)
+
.to(language:constant:resource:classpath:org/apache/camel/component/language/hello.txt)
+.to(mock:result);
+}
+};
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/0c872dc0/camel-core/src/test/resources/org/apache/camel/component/language/hello.txt
--
diff --git
a/camel-core/src/test/resources/org/apache/camel/component/language/hello.txt
b/camel-core/src/test/resources/org/apache/camel/component/language/hello.txt
new file mode 100644
[4/5] git commit: CAMEL-7155 Fixed the issue of StringHelper
CAMEL-7155 Fixed the issue of StringHelper
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b415b42
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b415b42
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b415b42
Branch: refs/heads/camel-2.12.x
Commit: 7b415b426736638a0b9fdd66e7e3136d0f23f4ff
Parents: 66d30bf
Author: Claus Ibsen davscl...@apache.org
Authored: Tue Feb 18 18:19:35 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue Feb 18 18:35:26 2014 +0100
--
.../src/test/java/org/apache/camel/util/StringHelperTest.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7b415b42/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
b/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
index 2618e94..e9c5ed2 100644
--- a/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
@@ -87,12 +87,13 @@ public class StringHelperTest extends TestCase {
assertEquals(false, StringHelper.hasStartToken(Hello World, null));
assertEquals(false, StringHelper.hasStartToken(Hello World,
simple));
-assertEquals(true, StringHelper.hasStartToken(${body}, null));
+assertEquals(false, StringHelper.hasStartToken(${body}, null));
assertEquals(true, StringHelper.hasStartToken(${body}, simple));
assertEquals(true, StringHelper.hasStartToken($simple{body},
simple));
-assertEquals(true, StringHelper.hasStartToken(${body}, null));
-assertEquals(true, StringHelper.hasStartToken(${body}, foo));
+assertEquals(false, StringHelper.hasStartToken(${body}, null));
+assertEquals(false, StringHelper.hasStartToken(${body}, foo));
+// $foo{ is valid because its foo language
assertEquals(true, StringHelper.hasStartToken($foo{body}, foo));
}
[3/5] git commit: CAMEL-7219: Fixed language component to be able to load resources from classpath.
CAMEL-7219: Fixed language component to be able to load resources from
classpath.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/66d30bfd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/66d30bfd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/66d30bfd
Branch: refs/heads/camel-2.12.x
Commit: 66d30bfd306322d06941502424475e2be442406d
Parents: f02b9be
Author: Claus Ibsen davscl...@apache.org
Authored: Tue Feb 18 17:54:22 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue Feb 18 18:35:19 2014 +0100
--
.../component/language/LanguageComponent.java | 4 ++
...geResourceLoadConstantFromClasspathTest.java | 46
.../apache/camel/component/language/hello.txt | 1 +
3 files changed, 51 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/66d30bfd/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
index 24a9e07..2942ae3 100644
---
a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
@@ -61,9 +61,13 @@ public class LanguageComponent extends UriEndpointComponent {
if (ResourceHelper.hasScheme(resource)) {
// the script is a uri for a resource
resourceUri = resource;
+// then the script should be null
+script = null;
} else {
// the script is provided as text in the uri, so decode to
utf-8
script = URLDecoder.decode(script, UTF-8);
+// then the resource should be null
+resourceUri = null;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/66d30bfd/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
b/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
new file mode 100644
index 000..aa98835
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.language;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version
+ */
+public class LanguageResourceLoadConstantFromClasspathTest extends
ContextTestSupport {
+
+public void testLanguage() throws Exception {
+getMockEndpoint(mock:result).expectedBodiesReceived(Hello this is
some text.);
+
+template.sendBody(direct:start, World);
+
+assertMockEndpointsSatisfied();
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from(direct:start)
+
.to(language:constant:resource:classpath:org/apache/camel/component/language/hello.txt)
+.to(mock:result);
+}
+};
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/66d30bfd/camel-core/src/test/resources/org/apache/camel/component/language/hello.txt
--
diff --git
a/camel-core/src/test/resources/org/apache/camel/component/language/hello.txt
b/camel-core/src/test/resources/org/apache/camel/component/language/hello.txt
new file mode
[1/5] git commit: CAMEL-7219: Fixed language component to be able to load resources from classpath.
Repository: camel
Updated Branches:
refs/heads/camel-2.11.x 827b0b027 - 0c872dc03
refs/heads/camel-2.12.x f02b9bec7 - 7b415b426
refs/heads/master 9640e23f1 - fdf9871fb
CAMEL-7219: Fixed language component to be able to load resources from
classpath.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80c7935d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80c7935d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80c7935d
Branch: refs/heads/master
Commit: 80c7935dd5462aede67ba97e8b83639a3dde4280
Parents: 9640e23
Author: Claus Ibsen davscl...@apache.org
Authored: Tue Feb 18 17:54:22 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue Feb 18 17:54:34 2014 +0100
--
.../component/language/LanguageComponent.java | 4 ++
...geResourceLoadConstantFromClasspathTest.java | 46
.../apache/camel/component/language/hello.txt | 1 +
3 files changed, 51 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/80c7935d/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
index 24a9e07..2942ae3 100644
---
a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
@@ -61,9 +61,13 @@ public class LanguageComponent extends UriEndpointComponent {
if (ResourceHelper.hasScheme(resource)) {
// the script is a uri for a resource
resourceUri = resource;
+// then the script should be null
+script = null;
} else {
// the script is provided as text in the uri, so decode to
utf-8
script = URLDecoder.decode(script, UTF-8);
+// then the resource should be null
+resourceUri = null;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/80c7935d/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
b/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
new file mode 100644
index 000..aa98835
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadConstantFromClasspathTest.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.language;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version
+ */
+public class LanguageResourceLoadConstantFromClasspathTest extends
ContextTestSupport {
+
+public void testLanguage() throws Exception {
+getMockEndpoint(mock:result).expectedBodiesReceived(Hello this is
some text.);
+
+template.sendBody(direct:start, World);
+
+assertMockEndpointsSatisfied();
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from(direct:start)
+
.to(language:constant:resource:classpath:org/apache/camel/component/language/hello.txt)
+.to(mock:result);
+}
+};
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/80c7935d/camel-core/src/test/resources/org/apache/camel/component/language/hello.txt
--
diff --git
[2/5] git commit: CAMEL-7155 Fixed the issue of StringHelper
CAMEL-7155 Fixed the issue of StringHelper
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fdf9871f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fdf9871f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fdf9871f
Branch: refs/heads/master
Commit: fdf9871fbd3101e6c2ac77c99a49e233f6b2d748
Parents: 80c7935
Author: Claus Ibsen davscl...@apache.org
Authored: Tue Feb 18 18:19:35 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue Feb 18 18:19:35 2014 +0100
--
.../src/test/java/org/apache/camel/util/StringHelperTest.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fdf9871f/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
b/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
index 2618e94..e9c5ed2 100644
--- a/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java
@@ -87,12 +87,13 @@ public class StringHelperTest extends TestCase {
assertEquals(false, StringHelper.hasStartToken(Hello World, null));
assertEquals(false, StringHelper.hasStartToken(Hello World,
simple));
-assertEquals(true, StringHelper.hasStartToken(${body}, null));
+assertEquals(false, StringHelper.hasStartToken(${body}, null));
assertEquals(true, StringHelper.hasStartToken(${body}, simple));
assertEquals(true, StringHelper.hasStartToken($simple{body},
simple));
-assertEquals(true, StringHelper.hasStartToken(${body}, null));
-assertEquals(true, StringHelper.hasStartToken(${body}, foo));
+assertEquals(false, StringHelper.hasStartToken(${body}, null));
+assertEquals(false, StringHelper.hasStartToken(${body}, foo));
+// $foo{ is valid because its foo language
assertEquals(true, StringHelper.hasStartToken($foo{body}, foo));
}
git commit: CAMEL-7221: Upgrade to Lucene 4.6.1
Repository: camel
Updated Branches:
refs/heads/master fdf9871fb - 9fefab66c
CAMEL-7221: Upgrade to Lucene 4.6.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9fefab66
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9fefab66
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9fefab66
Branch: refs/heads/master
Commit: 9fefab66c55ce7f5635965fa90dadb139257edd6
Parents: fdf9871
Author: Babak Vahdat bvah...@apache.org
Authored: Tue Feb 18 20:00:24 2014 +0100
Committer: Babak Vahdat bvah...@apache.org
Committed: Tue Feb 18 20:00:24 2014 +0100
--
.../org/apache/camel/component/lucene/LuceneConfiguration.java | 2 +-
.../java/org/apache/camel/component/lucene/LuceneIndexer.java | 2 +-
.../java/org/apache/camel/component/lucene/LuceneSearcher.java | 2 +-
.../component/lucene/LuceneIndexAndQueryProducerTest.java | 6 +++---
.../camel/processor/lucene/LuceneQueryProcessorTest.java | 4 ++--
parent/pom.xml | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9fefab66/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
--
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
index 375132d..d76a6ee 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneConfiguration.java
@@ -35,7 +35,7 @@ public class LuceneConfiguration {
private File indexDirectory;
private Analyzer analyzer;
private int maxHits;
-private Version luceneVersion = Version.LUCENE_45;
+private Version luceneVersion = Version.LUCENE_46;
public LuceneConfiguration() {
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9fefab66/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
--
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
index c7831ce..561758d 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
@@ -144,7 +144,7 @@ public class LuceneIndexer {
private void openIndexWriter() throws IOException {
IndexWriterConfig indexWriterConfig;
// use create or append so we can reuse existing index if already
exists
-indexWriterConfig = new IndexWriterConfig(Version.LUCENE_45,
getAnalyzer()).setOpenMode(OpenMode.CREATE_OR_APPEND);
+indexWriterConfig = new IndexWriterConfig(Version.LUCENE_46,
getAnalyzer()).setOpenMode(OpenMode.CREATE_OR_APPEND);
indexWriter = new IndexWriter(niofsDirectory, indexWriterConfig);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9fefab66/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
--
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
index 33a38de..4232a21 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneSearcher.java
@@ -59,7 +59,7 @@ public class LuceneSearcher {
}
public Hits search(String searchPhrase, int maxNumberOfHits) throws
Exception {
-return search(searchPhrase, maxNumberOfHits, Version.LUCENE_45);
+return search(searchPhrase, maxNumberOfHits, Version.LUCENE_46);
}
public Hits search(String searchPhrase, int maxNumberOfHits, Version
luenceVersion) throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/9fefab66/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
--
diff --git
a/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
[CONF] Apache Camel Camel 2.13.0 Release
Babak Vahdat edited the page: Camel 2.13.0 Release ... AHC 1.7.20 to 1.7.21 APNS 0.1.6 to 0.2.3 Atomikos 3.8.0 to 3.9.2 AWS-SDK 1.5.1 to 1.6.3 Avro 1.7.3 to 1.7.5 BeanIO 2.0.6 to 2.0.7 Classmate from 0.8.0 to 1.0.0 Commons Httpclient 4.2.5 to 4.3.1 Commons Httpcore 4.2.4 to 4.3.1 CXF 2.7.6 to 2.7.10 EHCache Ehcache 2.7.2 to 2.8.01 Elasticsearch 0.20.6 to 0.90.5 FOP 1.0 to 1.1 Guave 14.0.1 to 15.0 Hazelcast 2.6 to 3.0.2 Hibernate Validator 5.0.1.Final to 5.0.3.Final ICal4j 1.0.4 to 1.0.5.2 Jclouds 1.6.2-incubating to 1.7.0 Jettison 1.3.4 to 1.3.5 Jetty 7.6.9 to 8.1.12 Joda time 2.1 to 2.3 JRuby 1.7.4 to 1.7.5 JSCH 0.1.49 to 0.1.50 Lucene 3.6.0 to 4.56.1 MongoDB Java Driver 2.11.2 to 2.11.3 MyBatis 3.2.2 to 3.2.4 OGNL 3.0.6 to 3.0.8 Quartz 2.2.0 to 2.2.1 RabbitMQ amqp Java Client 3.1.3 to 3.2.2. Restlet 2.0.15 to 2.1.4 Saxon 9.5.0.2 to 9.5.1-2 Scala 2.10.2 to 2.10.3 Servlet API 2.5 to 3.0 SNMP4J 2.2.2 to 2.2.3 SolrJ 3.6.2 to 4.5.1 Spring Batch 2.2.1.RELEASE to 2.2.2.RELEASE Spring Redis 1.0.4.RELEASE to 1.1.0.RELEASE SSHD 0.8.0 to 0.9.0 TestNG 6.8.5 to 6.8.7 XStream 1.4.4 to 1.4.5 ... View Online Like View Changes
svn commit: r898424 - in /websites/production/camel/content: cache/main.pageCache camel-2130-release.html
Author: buildbot Date: Tue Feb 18 19:19:39 2014 New Revision: 898424 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2130-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2130-release.html == --- websites/production/camel/content/camel-2130-release.html (original) +++ websites/production/camel/content/camel-2130-release.html Tue Feb 18 19:19:39 2014 @@ -87,7 +87,7 @@ tr td valign=top width=100% div class=wiki-content maincontenth1 id=Camel2.13.0Release-Camel2.13.0release(currentlyinprogress)Camel 2.13.0 release (currently in progress)/h1div style=padding-right:20px;float:left;margin-left:-20px; -pspan class=image-wrap style=img src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; style=border: 0px solid black/span/p/divdiv style=min-height:200px/divh2 id=Camel2.13.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to the 2.13.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)/pulliThe MBean names registered by a shape=rect href=camel-jmx.htmlCamel JMX/a no longer include the hostname in the codecontext/code part, eg before codecontext=myHost/myCamelId/code and now after codecontext=myCamelId/code. 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./lilia shape=rect href=camel-jmx.htmlMBean naming/a in OSGi cleaned up to use simpler naming with symbolicName. Before we could have MBean names with duplicate bundle ids such as codecontext=114-114-camel-6/code, which now is using the symbolic name instead, codecontext=MyApplication/code./liliWhen using multiple OSGi Blueprint lt;cm:property-placeholdergt;'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./lilia shape=rect href=ftp2.htmlFTP/a 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./lilia shape=rect href=ftp2.htmlFTP/a consumer allow to ignore file not found or insufficient file permission errors./lilia shape=rect href=data-format.htmlData Format/a using marshal now leverages a shape=rect href=stream-caching.htmlStream caching/a out of th e box if enabled, which allows to marshal big streams and spool to disk, instead of being pure in-memory based./liliImproved using a shape=rect href=bean.htmlBean/a when the bean is looked up in the a shape=rect href=registry.htmlRegistry/a, when using concurrent processing in the route./liliAdded codecache/code option to codebeanRef/code and codelt;beangt;/code in the DSL. This avoids looking up the a shape=rect href=bean.htmlBean/a from the a shape=rect href=registry.htmlRegistry/a on each usage; this can safely be done for singleton beans./liliConfiguring a shape=rect href=data-format.htmlData Format/as in XML attributes now supports reference lookup using the # syntax, eg codelt;jaxb xmlStreamWriterWrapper=#myWriterWrapper ..gt;/code/lilia shape=rect href=jdbc.htmlJDBC/a component now also support codeoutputType/code to specify the expected output as either a List or single Object. As well allow to map to a bean using a codeBeanRowMapper/code to control the mapping of ROW names to bean properties./liliBoth a shape=rect href=quartz.htmlQuartz/a as well as a shape=rect href=quartz2.htmlQuartz2/a based a shape=rect href=scheduledroutepolicy.htmlScheduledRoutePolicy/a has been improved to better support cluster setups (e.g. to not schedule jobs being already scheduled through another node inside a given cluster)./liliReduced the work the a shape=rect href=aggregator2.htmlAggregate/a EIP does while holding a lock during aggregation, which can lead to improved performance in some use-cases./lilicodeJndiRegistry/code now implements all the find methods./lilia shape=rect href=vm.htmlVM/a component now supports codemultipleConsumers=true/code across deployment units./liliAdded code@PreConsumed/code to a shape=rect href=jpa.htmlJPA/a consumer./liliAdded CamelFileName header support to the a shape=rect href=hdfs.htmlHDFS/a producer/liliLike as codeJpaConsumer/code now also codeJpaProducer/code of the a shape=rect href=jpa.htmlJPA/a component supports the codeCamelEntityManager/code header./lilia shape=rect
git commit: [CAMEL-7218] Changed activator class loading in PlatformHelper.
Repository: camel
Updated Branches:
refs/heads/master 9fefab66c - 9477c5775
[CAMEL-7218] Changed activator class loading in PlatformHelper.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9477c577
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9477c577
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9477c577
Branch: refs/heads/master
Commit: 9477c5775c59756649f69c7866a5e185eb191ae3
Parents: 9fefab6
Author: Henryk Konsek hekon...@gmail.com
Authored: Tue Feb 18 21:25:26 2014 +0100
Committer: Henryk Konsek hekon...@gmail.com
Committed: Tue Feb 18 21:25:26 2014 +0100
--
.../org/apache/camel/util/PlatformHelper.java | 4 ++-
.../apache/camel/util/PlatformHelperTest.java | 31
2 files changed, 34 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9477c577/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
b/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
index 3fd0338..438af11 100644
--- a/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
@@ -18,6 +18,8 @@ package org.apache.camel.util;
import java.lang.reflect.Method;
+import static java.lang.Thread.currentThread;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +43,7 @@ public final class PlatformHelper {
try {
// Try to load the BundleActivator first
Class.forName(org.osgi.framework.BundleActivator);
-Class? activatorClass =
Class.forName(org.apache.camel.osgi.Activator);
+Class? activatorClass =
currentThread().getContextClassLoader().loadClass(org.apache.camel.osgi.Activator);
Method getBundleMethod =
activatorClass.getDeclaredMethod(getBundle);
Object bundle = getBundleMethod.invoke(null);
return bundle != null;
http://git-wip-us.apache.org/repos/asf/camel/blob/9477c577/camel-core/src/test/java/org/apache/camel/util/PlatformHelperTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/util/PlatformHelperTest.java
b/camel-core/src/test/java/org/apache/camel/util/PlatformHelperTest.java
new file mode 100644
index 000..72fbec0
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/util/PlatformHelperTest.java
@@ -0,0 +1,31 @@
+/**
+ * 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.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.apache.camel.util.PlatformHelper.isInOsgiEnvironment;
+
+public class PlatformHelperTest extends Assert {
+
+@Test
+public void shouldNotFindOsgiContext() {
+assertFalse(isInOsgiEnvironment());
+}
+
+}
\ No newline at end of file
git commit: Switched bean-validator to PlatformHelper.
Repository: camel
Updated Branches:
refs/heads/master 9477c5775 - 16762eaa5
Switched bean-validator to PlatformHelper.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16762eaa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16762eaa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16762eaa
Branch: refs/heads/master
Commit: 16762eaa5474f0cd8a0285f2d5b66d66ee56cff2
Parents: 9477c57
Author: Henryk Konsek hekon...@gmail.com
Authored: Tue Feb 18 21:27:42 2014 +0100
Committer: Henryk Konsek hekon...@gmail.com
Committed: Tue Feb 18 21:27:42 2014 +0100
--
.../bean/validator/BeanValidatorComponent.java | 15 ---
1 file changed, 4 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/16762eaa/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
--
diff --git
a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
index 0de0f7f..b226263 100644
---
a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
+++
b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
@@ -31,19 +31,14 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.ProcessorEndpoint;
+import static org.apache.camel.util.PlatformHelper.isInOsgiEnvironment;
+
/**
* Bean Validator Component for validating Java beans against reference
implementation of JSR 303 Validator (Hibernate
* Validator).
*/
public class BeanValidatorComponent extends DefaultComponent {
-/**
- * Prefix of the OSGi-aware implementations of {@code
org.apache.camel.CamelContext} interface (like
- * {@code org.apache.camel.core.osgi.OsgiDefaultCamelContext} or
- * {@code org.apache.camel.osgi.OsgiSpringCamelContext} ).
- */
-private static final String OSGI_CONTEXT_CLASS_PREFIX = Osgi;
-
@Override
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
BeanValidator beanValidator = new BeanValidator();
@@ -105,14 +100,12 @@ public class BeanValidatorComponent extends
DefaultComponent {
}
/**
- * Recognizes if component is executed in the OSGi environment. This
implementation assumes that component is
- * deployed into OSGi environment if it uses implementation of {@code
org.apache.camel.CamelContext} with class
- * name starting with the Osgi prefix.
+ * Recognizes if component is executed in the OSGi environment.
*
* @return true if component is executed in the OSGi environment. False
otherwise.
*/
protected boolean isOsgiContext() {
-return
getCamelContext().getClass().getSimpleName().startsWith(OSGI_CONTEXT_CLASS_PREFIX);
+return isInOsgiEnvironment();
}
}
\ No newline at end of file
git commit: CAMEL-7222: Upgrade to SolrJ 4.6.0
Repository: camel
Updated Branches:
refs/heads/master 16762eaa5 - e532b283d
CAMEL-7222: Upgrade to SolrJ 4.6.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e532b283
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e532b283
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e532b283
Branch: refs/heads/master
Commit: e532b283d21cf6a9c37cfcc5d449a63f14ab2a43
Parents: 16762ea
Author: Babak Vahdat bvah...@apache.org
Authored: Tue Feb 18 21:59:23 2014 +0100
Committer: Babak Vahdat bvah...@apache.org
Committed: Tue Feb 18 21:59:23 2014 +0100
--
components/camel-solr/pom.xml | 62 ++
parent/pom.xml| 4 +--
2 files changed, 18 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e532b283/components/camel-solr/pom.xml
--
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 53f839f..910d985 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -43,41 +43,31 @@
artifactIdcamel-core/artifactId
/dependency
dependency
+ groupIdorg.apache.solr/groupId
+ artifactIdsolr-solrj/artifactId
+ version${solr-version}/version
+/dependency
+dependency
groupIdcommons-codec/groupId
artifactIdcommons-codec/artifactId
version${commons-codec-version}/version
/dependency
dependency
- groupIdorg.apache.solr/groupId
- artifactIdsolr-solrj/artifactId
- version${solr-version}/version
- exclusions
-!-- exclude rome 0.9 which is not a valid Maven artifact --
-!-- rome is not a needed dependency --
-exclusion
- groupIdrome/groupId
- artifactIdrome/artifactId
-/exclusion
- /exclusions
+ groupIdorg.apache.httpcomponents/groupId
+ artifactIdhttpclient/artifactId
+ version${httpclient4-version}/version
/dependency
dependency
- groupIdorg.apache.camel/groupId
- artifactIdcamel-test/artifactId
- scopetest/scope
+ groupIdorg.apache.httpcomponents/groupId
+ artifactIdhttpmime/artifactId
+ version${httpclient4-version}/version
/dependency
+!-- test dependencies --
dependency
- groupIdorg.apache.solr/groupId
- artifactIdsolr-core/artifactId
- version${solr-version}/version
+ groupIdorg.apache.camel/groupId
+ artifactIdcamel-test/artifactId
scopetest/scope
- exclusions
-!-- exclude jdk14 as we want to use log4j --
-exclusion
- groupIdorg.slf4j/groupId
- artifactIdslf4j-jdk14/artifactId
-/exclusion
- /exclusions
/dependency
dependency
groupIdorg.apache.solr/groupId
@@ -85,35 +75,15 @@
version${solr-version}/version
scopetest/scope
exclusions
-!-- exclude netcdf as it has a slf4j binding --
-exclusion
- groupIdedu.ucar/groupId
- artifactIdnetcdf/artifactId
-/exclusion
-exclusion
- groupIdasm/groupId
-artifactIdasm/artifactId
-/exclusion
+!-- exclude rome 0.9 which is not a valid Maven artifact --
!-- rome is not a needed dependency --
exclusion
groupIdrome/groupId
artifactIdrome/artifactId
-/exclusion
+/exclusion
/exclusions
/dependency
dependency
-groupIdorg.apache.httpcomponents/groupId
-artifactIdhttpclient/artifactId
-version${httpclient4-version}/version
- /dependency
- dependency
-groupIdorg.apache.httpcomponents/groupId
-artifactIdhttpmime/artifactId
-version${httpclient4-version}/version
- /dependency
-
-!-- test dependencies --
-dependency
groupIdorg.eclipse.jetty/groupId
artifactIdjetty-server/artifactId
version${jetty-version}/version
http://git-wip-us.apache.org/repos/asf/camel/blob/e532b283/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3dc9a01..fbc59e3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -368,8 +368,8 @@
smack-version3.2.1/smack-version
snappy-version1.1.0.1/snappy-version
snmp4j-version2.2.3_1/snmp4j-version
-solr-bundle-version4.5.1_1/solr-bundle-version
-solr-version4.5.1/solr-version
+solr-bundle-version4.6.0_1/solr-bundle-version
+solr-version4.6.0/solr-version
solr-version-range[4.5,5)/solr-version-range
splunk-version1.2.0_1/splunk-version
spring-batch-version2.2.3.RELEASE/spring-batch-version
git commit: CAMEL-7223: Avoid using hard-coded ports for the unit-tests
Repository: camel
Updated Branches:
refs/heads/master e532b283d - e10f04b50
CAMEL-7223: Avoid using hard-coded ports for the unit-tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e10f04b5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e10f04b5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e10f04b5
Branch: refs/heads/master
Commit: e10f04b506f81dc7d5dbbe90af5259e813673c25
Parents: e532b28
Author: Babak Vahdat bvah...@apache.org
Authored: Tue Feb 18 22:11:05 2014 +0100
Committer: Babak Vahdat bvah...@apache.org
Committed: Tue Feb 18 22:11:05 2014 +0100
--
.../camel/component/solr/SolrComponent.java | 5 +--
.../component/solr/InitSolrEndpointTest.java| 5 ++-
.../solr/SolrComponentTestSupport.java | 12 +++
.../component/solr/SolrServerMissingTest.java | 5 ++-
.../camel/component/solr/SolrTestSupport.java | 37
5 files changed, 48 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e10f04b5/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
--
diff --git
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
index a8827b4..646d8ed 100644
---
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
+++
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
@@ -66,6 +66,7 @@ public class SolrComponent extends DefaultComponent {
}
}
+@Override
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
Endpoint endpoint = new SolrEndpoint(uri, this, remaining);
setProperties(endpoint, parameters);
@@ -95,7 +96,7 @@ public class SolrComponent extends DefaultComponent {
void shutdownServers(SolrServerReference ref, boolean remove) {
try {
if (ref.getSolrServer() != null) {
-LOG.info(Shutting down solr server: + ref.getSolrServer());
+LOG.info(Shutting down solr server: {}, ref.getSolrServer());
ref.getSolrServer().shutdown();
}
} catch (Exception e) {
@@ -103,7 +104,7 @@ public class SolrComponent extends DefaultComponent {
}
try {
if (ref.getUpdateSolrServer() != null) {
-LOG.info(Shutting down update solr server: +
ref.getUpdateSolrServer());
+LOG.info(Shutting down update solr server: {},
ref.getUpdateSolrServer());
ref.getUpdateSolrServer().shutdownNow();
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/camel/blob/e10f04b5/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
--
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
index e75d99a..b00de3c 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
@@ -17,12 +17,11 @@
package org.apache.camel.component.solr;
import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class InitSolrEndpointTest extends CamelTestSupport {
+public class InitSolrEndpointTest extends SolrTestSupport {
-private String solrUrl = solr://localhost:8999/solr;
+private String solrUrl = solr://localhost: + getPort() + /solr;
@Test
public void endpointCreatedCorrectlyWithAllOptions() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/e10f04b5/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
--
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
index 4e0366c..ff8f59a 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
@@ -20,8 +20,6 @@ import java.util.HashMap;
import java.util.Map;
[CONF] Apache Camel Camel 2.13.0 Release
Babak Vahdat edited the page: Camel 2.13.0 Release ... AHC 1.7.20 to 1.7.21 APNS 0.1.6 to 0.2.3 Atomikos 3.8.0 to 3.9.2 AWS-SDK 1.5.1 to 1.6.3 Avro 1.7.3 to 1.7.5 BeanIO 2.0.6 to 2.0.7 Classmate from 0.8.0 to 1.0.0 Commons Httpclient 4.2.5 to 4.3.1 Commons Httpcore 4.2.4 to 4.3.1 CXF 2.7.6 to 2.7.10 Ehcache 2.7.2 to 2.8.1 Elasticsearch 0.20.6 to 0.90.5 FOP 1.0 to 1.1 Guave 14.0.1 to 15.0 Hazelcast 2.6 to 3.0.2 Hibernate Validator 5.0.1.Final to 5.0.3.Final ICal4j 1.0.4 to 1.0.5.2 Jclouds 1.6.2-incubating to 1.7.0 Jettison 1.3.4 to 1.3.5 Jetty 7.6.9 to 8.1.12 Joda time 2.1 to 2.3 JRuby 1.7.4 to 1.7.5 JSCH 0.1.49 to 0.1.50 Lucene 3.6.0 to 4.6.1 MongoDB Java Driver 2.11.2 to 2.11.3 MyBatis 3.2.2 to 3.2.4 OGNL 3.0.6 to 3.0.8 Quartz 2.2.0 to 2.2.1 RabbitMQ amqp Java Client 3.1.3 to 3.2.2. Restlet 2.0.15 to 2.1.4 Saxon 9.5.0.2 to 9.5.1-2 Scala 2.10.2 to 2.10.3 Servlet API 2.5 to 3.0 SNMP4J 2.2.2 to 2.2.3 SolrJ 3.6.2 to 4.56.10 Spring Batch 2.2.1.RELEASE to 2.2.2.RELEASE Spring Redis 1.0.4.RELEASE to 1.1.0.RELEASE SSHD 0.8.0 to 0.9.0 TestNG 6.8.5 to 6.8.7 XStream 1.4.4 to 1.4.57 Internal changes Add RouteAware API to inject Route for Service's in routes, for example the Consumer's of the routes. IOHelper.gerCharsetName will now lookup key Exchange.CHARSET_NAME in header first and then fallback to property.
git commit: [CAMEL-7218] Added possibility to explictly specify class loader for OSGi checks.
Repository: camel
Updated Branches:
refs/heads/master e10f04b50 - 8b9d4c625
[CAMEL-7218] Added possibility to explictly specify class loader for OSGi
checks.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8b9d4c62
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8b9d4c62
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8b9d4c62
Branch: refs/heads/master
Commit: 8b9d4c625202455309a84c8ca492177ea28b2327
Parents: e10f04b
Author: Henryk Konsek hekon...@gmail.com
Authored: Tue Feb 18 22:15:20 2014 +0100
Committer: Henryk Konsek hekon...@gmail.com
Committed: Tue Feb 18 22:16:13 2014 +0100
--
.../src/main/java/org/apache/camel/util/PlatformHelper.java | 9 +++--
.../apache/camel/spring/handler/CamelNamespaceHandler.java | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8b9d4c62/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
b/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
index 438af11..258248c 100644
--- a/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/PlatformHelper.java
@@ -37,13 +37,14 @@ public final class PlatformHelper {
* Determine whether Camel is running in the OSGi environment. Current
implementation tries to load Camel activator
* bundle (using reflection API and class loading) to determine if the
code is executed in the OSGi environment.
*
+ * @param classLoader caller class loader to be used to load Camel Bundle
Activator
* @return true if caller is running in the OSGi environment, false
otherwise
*/
-public static boolean isInOsgiEnvironment() {
+public static boolean isInOsgiEnvironment(ClassLoader classLoader) {
try {
// Try to load the BundleActivator first
Class.forName(org.osgi.framework.BundleActivator);
-Class? activatorClass =
currentThread().getContextClassLoader().loadClass(org.apache.camel.osgi.Activator);
+Class? activatorClass =
classLoader.loadClass(org.apache.camel.osgi.Activator);
Method getBundleMethod =
activatorClass.getDeclaredMethod(getBundle);
Object bundle = getBundleMethod.invoke(null);
return bundle != null;
@@ -53,4 +54,8 @@ public final class PlatformHelper {
}
}
+public static boolean isInOsgiEnvironment() {
+return isInOsgiEnvironment(currentThread().getContextClassLoader());
+}
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8b9d4c62/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 9a035c8..6535e69 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
@@ -128,7 +128,7 @@ public class CamelNamespaceHandler extends
NamespaceHandlerSupport {
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()) {
+if (PlatformHelper.isInOsgiEnvironment(getClass().getClassLoader())) {
try {
cl =
Class.forName(org.apache.camel.osgi.CamelContextFactoryBean);
LOG.info(OSGi environment detected.);
svn commit: r898434 - in /websites/production/camel/content: cache/main.pageCache camel-2130-release.html
Author: buildbot Date: Tue Feb 18 21:19:26 2014 New Revision: 898434 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2130-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2130-release.html == --- websites/production/camel/content/camel-2130-release.html (original) +++ websites/production/camel/content/camel-2130-release.html Tue Feb 18 21:19:26 2014 @@ -87,7 +87,7 @@ tr td valign=top width=100% div class=wiki-content maincontenth1 id=Camel2.13.0Release-Camel2.13.0release(currentlyinprogress)Camel 2.13.0 release (currently in progress)/h1div style=padding-right:20px;float:left;margin-left:-20px; -pspan class=image-wrap style=img src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; style=border: 0px solid black/span/p/divdiv style=min-height:200px/divh2 id=Camel2.13.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to the 2.13.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)/pulliThe MBean names registered by a shape=rect href=camel-jmx.htmlCamel JMX/a no longer include the hostname in the codecontext/code part, eg before codecontext=myHost/myCamelId/code and now after codecontext=myCamelId/code. 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./lilia shape=rect href=camel-jmx.htmlMBean naming/a in OSGi cleaned up to use simpler naming with symbolicName. Before we could have MBean names with duplicate bundle ids such as codecontext=114-114-camel-6/code, which now is using the symbolic name instead, codecontext=MyApplication/code./liliWhen using multiple OSGi Blueprint lt;cm:property-placeholdergt;'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./lilia shape=rect href=ftp2.htmlFTP/a 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./lilia shape=rect href=ftp2.htmlFTP/a consumer allow to ignore file not found or insufficient file permission errors./lilia shape=rect href=data-format.htmlData Format/a using marshal now leverages a shape=rect href=stream-caching.htmlStream caching/a out of th e box if enabled, which allows to marshal big streams and spool to disk, instead of being pure in-memory based./liliImproved using a shape=rect href=bean.htmlBean/a when the bean is looked up in the a shape=rect href=registry.htmlRegistry/a, when using concurrent processing in the route./liliAdded codecache/code option to codebeanRef/code and codelt;beangt;/code in the DSL. This avoids looking up the a shape=rect href=bean.htmlBean/a from the a shape=rect href=registry.htmlRegistry/a on each usage; this can safely be done for singleton beans./liliConfiguring a shape=rect href=data-format.htmlData Format/as in XML attributes now supports reference lookup using the # syntax, eg codelt;jaxb xmlStreamWriterWrapper=#myWriterWrapper ..gt;/code/lilia shape=rect href=jdbc.htmlJDBC/a component now also support codeoutputType/code to specify the expected output as either a List or single Object. As well allow to map to a bean using a codeBeanRowMapper/code to control the mapping of ROW names to bean properties./liliBoth a shape=rect href=quartz.htmlQuartz/a as well as a shape=rect href=quartz2.htmlQuartz2/a based a shape=rect href=scheduledroutepolicy.htmlScheduledRoutePolicy/a has been improved to better support cluster setups (e.g. to not schedule jobs being already scheduled through another node inside a given cluster)./liliReduced the work the a shape=rect href=aggregator2.htmlAggregate/a EIP does while holding a lock during aggregation, which can lead to improved performance in some use-cases./lilicodeJndiRegistry/code now implements all the find methods./lilia shape=rect href=vm.htmlVM/a component now supports codemultipleConsumers=true/code across deployment units./liliAdded code@PreConsumed/code to a shape=rect href=jpa.htmlJPA/a consumer./liliAdded CamelFileName header support to the a shape=rect href=hdfs.htmlHDFS/a producer/liliLike as codeJpaConsumer/code now also codeJpaProducer/code of the a shape=rect href=jpa.htmlJPA/a component supports the codeCamelEntityManager/code header./lilia shape=rect
git commit: CAMEL-7223: Avoid using hard-coded ports for the unit-tests Conflicts: components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 7b415b426 - 0a5fffbd1
CAMEL-7223: Avoid using hard-coded ports for the unit-tests
Conflicts:
components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0a5fffbd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0a5fffbd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0a5fffbd
Branch: refs/heads/camel-2.12.x
Commit: 0a5fffbd1b29059ec4f94531985282aac45dd500
Parents: 7b415b4
Author: Babak Vahdat bvah...@apache.org
Authored: Tue Feb 18 22:11:05 2014 +0100
Committer: Babak Vahdat bvah...@apache.org
Committed: Tue Feb 18 22:33:06 2014 +0100
--
.../camel/component/solr/SolrComponent.java | 5 +--
.../component/solr/InitSolrEndpointTest.java| 5 ++-
.../solr/SolrComponentTestSupport.java | 12 +++
.../component/solr/SolrServerMissingTest.java | 5 ++-
.../camel/component/solr/SolrTestSupport.java | 37
5 files changed, 48 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0a5fffbd/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
--
diff --git
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
index a8827b4..646d8ed 100644
---
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
+++
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
@@ -66,6 +66,7 @@ public class SolrComponent extends DefaultComponent {
}
}
+@Override
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
Endpoint endpoint = new SolrEndpoint(uri, this, remaining);
setProperties(endpoint, parameters);
@@ -95,7 +96,7 @@ public class SolrComponent extends DefaultComponent {
void shutdownServers(SolrServerReference ref, boolean remove) {
try {
if (ref.getSolrServer() != null) {
-LOG.info(Shutting down solr server: + ref.getSolrServer());
+LOG.info(Shutting down solr server: {}, ref.getSolrServer());
ref.getSolrServer().shutdown();
}
} catch (Exception e) {
@@ -103,7 +104,7 @@ public class SolrComponent extends DefaultComponent {
}
try {
if (ref.getUpdateSolrServer() != null) {
-LOG.info(Shutting down update solr server: +
ref.getUpdateSolrServer());
+LOG.info(Shutting down update solr server: {},
ref.getUpdateSolrServer());
ref.getUpdateSolrServer().shutdownNow();
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/camel/blob/0a5fffbd/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
--
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
index e75d99a..b00de3c 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
@@ -17,12 +17,11 @@
package org.apache.camel.component.solr;
import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class InitSolrEndpointTest extends CamelTestSupport {
+public class InitSolrEndpointTest extends SolrTestSupport {
-private String solrUrl = solr://localhost:8999/solr;
+private String solrUrl = solr://localhost: + getPort() + /solr;
@Test
public void endpointCreatedCorrectlyWithAllOptions() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/0a5fffbd/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
--
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
index a63cc6e..853b281 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
+++
git commit: CAMEL-7223: Avoid using hard-coded ports for the unit-tests Conflicts: components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
Repository: camel
Updated Branches:
refs/heads/camel-2.11.x 0c872dc03 - d302bbe60
CAMEL-7223: Avoid using hard-coded ports for the unit-tests
Conflicts:
components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d302bbe6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d302bbe6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d302bbe6
Branch: refs/heads/camel-2.11.x
Commit: d302bbe60e5ff7beccd648d71207deded6cd6c37
Parents: 0c872dc
Author: Babak Vahdat bvah...@apache.org
Authored: Tue Feb 18 22:11:05 2014 +0100
Committer: Babak Vahdat bvah...@apache.org
Committed: Tue Feb 18 22:37:58 2014 +0100
--
.../camel/component/solr/SolrComponent.java | 5 +--
.../component/solr/InitSolrEndpointTest.java| 5 ++-
.../solr/SolrComponentTestSupport.java | 12 +++
.../component/solr/SolrServerMissingTest.java | 5 ++-
.../camel/component/solr/SolrTestSupport.java | 37
5 files changed, 48 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d302bbe6/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
--
diff --git
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
index efde126..07404a0 100644
---
a/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
+++
b/components/camel-solr/src/main/java/org/apache/camel/component/solr/SolrComponent.java
@@ -71,6 +71,7 @@ public class SolrComponent extends DefaultComponent {
}
}
+@Override
protected Endpoint createEndpoint(String uri, String remaining,
MapString, Object parameters) throws Exception {
Endpoint endpoint = new SolrEndpoint(uri, this, remaining);
setProperties(endpoint, parameters);
@@ -100,7 +101,7 @@ public class SolrComponent extends DefaultComponent {
void shutdownServers(SolrServerReference ref, boolean remove) {
try {
if (ref.getSolrServer() != null) {
-LOG.info(Shutting down solr server: + ref.getSolrServer());
+LOG.info(Shutting down solr server: {}, ref.getSolrServer());
ref.getSolrServer().shutdown();
}
} catch (Exception e) {
@@ -108,7 +109,7 @@ public class SolrComponent extends DefaultComponent {
}
try {
if (ref.getUpdateSolrServer() != null) {
-LOG.info(Shutting down update solr server: +
ref.getUpdateSolrServer());
+LOG.info(Shutting down update solr server: {},
ref.getUpdateSolrServer());
ref.getUpdateSolrServer().shutdownNow();
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d302bbe6/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
--
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
index e75d99a..b00de3c 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
@@ -17,12 +17,11 @@
package org.apache.camel.component.solr;
import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class InitSolrEndpointTest extends CamelTestSupport {
+public class InitSolrEndpointTest extends SolrTestSupport {
-private String solrUrl = solr://localhost:8999/solr;
+private String solrUrl = solr://localhost: + getPort() + /solr;
@Test
public void endpointCreatedCorrectlyWithAllOptions() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/d302bbe6/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
--
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
index a63cc6e..853b281 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java
+++
git commit: CAMEL-7223: Avoid using hard-coded ports for the unit-tests
Repository: camel
Updated Branches:
refs/heads/camel-2.11.x d302bbe60 - fda86665a
CAMEL-7223: Avoid using hard-coded ports for the unit-tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fda86665
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fda86665
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fda86665
Branch: refs/heads/camel-2.11.x
Commit: fda86665a2cb8da8f94289bdadc40ea697630a47
Parents: d302bbe
Author: Babak Vahdat bvah...@apache.org
Authored: Tue Feb 18 23:08:17 2014 +0100
Committer: Babak Vahdat bvah...@apache.org
Committed: Tue Feb 18 23:08:17 2014 +0100
--
.../java/org/apache/camel/component/solr/SolrSpringTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fda86665/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
--
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
index 239ed1a..5ac3baa 100644
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
+++
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals;
public class SolrSpringTest extends AbstractJUnit4SpringContextTests {
static {
-System.setProperty(SolrServer.Port,
Integer.toString(SolrComponentTestSupport.PORT));
+System.setProperty(SolrServer.Port,
Integer.toString(SolrComponentTestSupport.getPort()));
}
private static JettySolrRunner solrRunner;
@@ -158,10 +158,10 @@ public class SolrSpringTest extends
AbstractJUnit4SpringContextTests {
System.setProperty(solr.directoryFactory,
solr.RAMDirectoryFactory);
// Start a Solr instance.
-solrRunner = new JettySolrRunner(/solr,
SolrComponentTestSupport.PORT);
+solrRunner = new JettySolrRunner(/solr,
SolrComponentTestSupport.getPort());
solrRunner.start();
-solrServer = new HttpSolrServer(http://localhost:; +
SolrComponentTestSupport.PORT + /solr);
+solrServer = new HttpSolrServer(http://localhost:; +
SolrComponentTestSupport.getPort() + /solr);
}
@AfterClass
[CONF] Apache Camel CXFRS
willem jiang edited the page: CXFRS ... NO Name Description Example Required? default value resourceClasses The resource classes which you want to export as REST service. Multiple classes can be separated by comma. resourceClasses=org.apache.camel.rs.Example1, org.apache.camel.rs.Exchange2 No None resourceClass Deprecated: Use resourceClasses The resource class which you want to export as REST service. resourceClass =org.apache.camel.rs.Example1 No None httpClientAPI new to Camel 2.1 If it is true, the CxfRsProducer will use the HttpClientAPI to invoke the service If it is false, the CxfRsProducer will use the ProxyClientAPI to invoke the service httpClientAPI=true No true synchronous New in 2.5, this option will let CxfRsConsumer decide to use sync or async API to do the underlying work. The default value is false which means it will try to use async API by default. synchronous=true No false throwExceptionOnFailure New in 2.6, this option tells the CxfRsProducer to inspect return
svn commit: r898457 - in /websites/production/camel/content: cache/main.pageCache cxfrs.html
Author: buildbot Date: Wed Feb 19 03:46:04 2014 New Revision: 898457 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/cxfrs.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/cxfrs.html == --- websites/production/camel/content/cxfrs.html (original) +++ websites/production/camel/content/cxfrs.html Wed Feb 19 03:46:04 2014 @@ -108,12 +108,7 @@ /div/divpWhere strongrsEndpoint/strong represents the spring bean's name which presents the CXFRS client or server/ppFor either style above, you can append options to the URI as follows:/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[cxfrs:bean:cxfEndpoint?resourceClasses=org.apache.camel.rs.Example ]]/script -/div/divh3 id=CXFRS-OptionsOptions/h3div class=table-wraptable class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceThp Name /p/thth colspan=1 rowspan=1 class=confluenceThp Description /p/thth colspan=1 rowspan=1 class=confluenceThp Example /p/thth colspan=1 rowspan=1 class=confluenceThp Required? /p/thth colspan=1 rowspan=1 class=confluenceThp default value /p/th/trtrtd colspan=1 rowspan=1 class=confluenceTdp coderesourceClasses/code /p/tdtd colspan=1 rowspan=1 class=confluenceTdp The resource classes which you want to export as REST service. Multiple classes can be separated by comma. /p/tdtd colspan=1 rowspan=1 class=confluenceTdp coderesourceClasses=org.apache.camel.rs.Example1,/codebr clear=none -codeorg.apache.camel.rs.Exchange2/code /p/tdtd colspan=1 rowspan=1 class=confluenceTdp No /p/tdtd colspan=1 rowspan=1 class=confluenceTdp emNone/em /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp coderesourceClass/code /p/tdtd colspan=1 rowspan=1 class=confluenceTdp strongDeprecated/strong: Use coderesourceClasses/code The resource class which you want to export as REST service. /p/tdtd colspan=1 rowspan=1 class=confluenceTdp coderesourceClass =org.apache.camel.rs.Example1/code /p/tdtd colspan=1 rowspan=1 class=confluenceTdp No /p/tdtd colspan=1 rowspan=1 class=confluenceTdp emNone/em /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp codehttpClientAPI/code /p/tdtd colspan=1 rowspan=1 class=confluenceTdp strongnew to Camel 2.1/strong If it is true, the CxfRsProducer will use the HttpClientAPI to invoke the se rvice br clear=none class=atl-forced-newline -If it is false, the CxfRsProducer will use the ProxyClientAPI to invoke the service /p/tdtd colspan=1 rowspan=1 class=confluenceTdp httpClientAPI=true /p/tdtd colspan=1 rowspan=1 class=confluenceTdp No /p/tdtd colspan=1 rowspan=1 class=confluenceTdp emtrue/em /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp synchronous /p/tdtd colspan=1 rowspan=1 class=confluenceTdp New in 2.5, this option will let CxfRsConsumer decide to use sync or async API to do the underlying work. The default value is false which means it will try to use async API by default. /p/tdtd colspan=1 rowspan=1 class=confluenceTdp synchronous=true /p/tdtd colspan=1 rowspan=1 class=confluenceTdp No /p/tdtd colspan=1 rowspan=1 class=confluenceTdp false /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp throwExceptionOnFailure /p/tdtd colspan=1 rowspan=1 class=confluenc eTdp New in 2.6, this option tells the CxfRsProducer to inspect return codes and will generate an Exception if the return code is larger than 207. /p/tdtd colspan=1 rowspan=1 class=confluenceTdp throwExceptionOnFailure=true /p/tdtd colspan=1 rowspan=1 class=confluenceTdp No /p/tdtd colspan=1 rowspan=1 class=confluenceTdp true /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp codemaxClientCacheSize/code /p/tdtd colspan=1 rowspan=1 class=confluenceTdp New in 2.6, you can set a IN message header CamelDestinationOverrideUrl to dynamically override the target destination Web Service or REST Service defined in your routes.#160; The implementation caches CXF clients or ClientFactoryBean in CxfProvider and CxfRsProvider.#160; This option allows you to configure the maximum size of the cache. br clear=none class=atl-forced-newline /p/tdtd colspan=1 rowspan=1 class=confluenceTdp maxClien tCacheSize=5 /p/tdtd colspan=1 rowspan=1 class=confluenceTdp No br clear=none class=atl-forced-newline /p/tdtd colspan=1 rowspan=1 class=confluenceTdp 10 /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp codesetDefaultBus/code /p/tdtd colspan=1 rowspan=1 class=confluenceTdp New in 2.9.0. Will set the default bus when CXF endpoint create a bus by itself /p/tdtd colspan=1 rowspan=1 class=confluenceTdp codesetDefaultBus=true/code /p/tdtd
