You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/05/28 11:36:41 UTC
[1/5] git commit: CAMEL-6400: Added unit test. Thanks to Nerses
Aznauryan for the test.
Updated Branches:
refs/heads/master b5902106e -> 13a454b27
CAMEL-6400: Added unit test. Thanks to Nerses Aznauryan for the test.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/89a575a0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/89a575a0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/89a575a0
Branch: refs/heads/master
Commit: 89a575a0e8cd1cab33ee3ead3c36dc5a13024450
Parents: 4e7a1d6
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 28 07:45:53 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 28 07:55:46 2013 +0200
----------------------------------------------------------------------
.../SpringSimplePropertyPlaceholderClashTest.java | 51 +++++++++++++++
...gSimplePropertyPlaceholderClashTest-context.xml | 32 +++++++++
...simplePropertiesPlaceholderClashTest.properties | 18 +++++
3 files changed, 101 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/89a575a0/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java
new file mode 100644
index 0000000..f8b7fb1
--- /dev/null
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest.java
@@ -0,0 +1,51 @@
+/**
+ * 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.language;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class SpringSimplePropertyPlaceholderClashTest extends SpringTestSupport {
+
+ @Override
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest-context.xml");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .setHeader(Exchange.FILE_NAME, simple("{{file.rootdir}}/$simple{in.header.CamelFileName}"))
+ .to("mock:result");
+ }
+ };
+ }
+
+ public void testReplaceSimpleExpression() throws Exception {
+ getMockEndpoint("mock:result").expectedHeaderReceived(Exchange.FILE_NAME, "/root/dir/test.txt");
+
+ template.sendBodyAndHeader("direct:start", "Test", Exchange.FILE_NAME, "test.txt");
+
+ assertMockEndpointsSatisfied();
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/89a575a0/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest-context.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest-context.xml b/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest-context.xml
new file mode 100644
index 0000000..437836f
--- /dev/null
+++ b/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimplePropertyPlaceholderClashTest-context.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:camel="http://camel.apache.org/schema/spring"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+ <bean id="bridgePropertyPlaceholder" class="org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:org/apache/camel/language/simplePropertiesPlaceholderClashTest.properties"/>
+ </bean>
+
+ <camel:camelContext id="camel">
+ <camel:contextScan/>
+ </camel:camelContext>
+
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/89a575a0/components/camel-spring/src/test/resources/org/apache/camel/language/simplePropertiesPlaceholderClashTest.properties
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/language/simplePropertiesPlaceholderClashTest.properties b/components/camel-spring/src/test/resources/org/apache/camel/language/simplePropertiesPlaceholderClashTest.properties
new file mode 100644
index 0000000..48adbb2
--- /dev/null
+++ b/components/camel-spring/src/test/resources/org/apache/camel/language/simplePropertiesPlaceholderClashTest.properties
@@ -0,0 +1,18 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+file.rootdir=/root/dir
\ No newline at end of file
[4/5] git commit: camel-sap-netweaver component. Work in progress.
Posted by da...@apache.org.
camel-sap-netweaver component. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ca003be
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ca003be
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ca003be
Branch: refs/heads/master
Commit: 2ca003beb82b8bc4c12a6627991f18a50235fc97
Parents: 4f67732
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 28 10:59:34 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 28 10:59:34 2013 +0200
----------------------------------------------------------------------
components/camel-sap-netweaver/pom.xml | 131 ++++++++++-----
.../component/sap/netweaver/NetWeaverProducer.java | 13 +-
2 files changed, 93 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ca003be/components/camel-sap-netweaver/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/pom.xml b/components/camel-sap-netweaver/pom.xml
index 1145c11..c0b0c99 100644
--- a/components/camel-sap-netweaver/pom.xml
+++ b/components/camel-sap-netweaver/pom.xml
@@ -15,52 +15,95 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>components</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <version>2.12-SNAPSHOT</version>
+ </parent>
- <parent>
- <artifactId>components</artifactId>
<groupId>org.apache.camel</groupId>
- <version>2.12-SNAPSHOT</version>
- </parent>
+ <artifactId>camel-sap-netweaver</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Weather</name>
+ <description>Camel SAP NetWeaver support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.sap.netweaver.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=sap-netweaver
+ </camel.osgi.export.service>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkMode>once</forkMode>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <includes>
+ <!-- Here we only run test of -->
+ <include>**/*UriConfigurationTest.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-sap-netweaver</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: Weather</name>
- <description>Camel SAP NetWeaver support</description>
-
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.sap.netweaver.*</camel.osgi.export.pkg>
- <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=sap-netweaver</camel.osgi.export.service>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson-version}</version>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- requires online access and a valid SAP account -->
+ <profiles>
+ <profile>
+ <id>sap-test</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkMode>once</forkMode>
+ <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/2ca003be/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
index d462a96..dfc1b9c 100644
--- a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
+++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
@@ -22,9 +22,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ServiceHelper;
-import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
public class NetWeaverProducer extends DefaultProducer {
@@ -53,13 +51,14 @@ public class NetWeaverProducer extends DefaultProducer {
http.process(dummy);
String json = dummy.hasOut() ? dummy.getOut().getBody(String.class) : dummy.getIn().getBody(String.class);
- System.out.println(json);
- ObjectMapper mapper = new ObjectMapper();
- Map map = mapper.readValue(json, Map.class);
- System.out.println(map);
+ // map json string to json map
+ if (json != null) {
+ ObjectMapper mapper = new ObjectMapper();
+ Map map = mapper.readValue(json, Map.class);
- exchange.getIn().setBody(map);
+ exchange.getIn().setBody(map);
+ }
}
@Override
[2/5] git commit: camel-sap-netweaver component. Work in progress.
Posted by da...@apache.org.
camel-sap-netweaver component. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4e7a1d64
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4e7a1d64
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4e7a1d64
Branch: refs/heads/master
Commit: 4e7a1d649b24f53fbc9ede2c5d402dd9f12e6bc1
Parents: b590210
Author: Claus Ibsen <da...@apache.org>
Authored: Mon May 27 16:44:25 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 28 07:55:46 2013 +0200
----------------------------------------------------------------------
components/camel-sap-netweaver/pom.xml | 66 +++++
.../sap/netweaver/NetWeaverComponent.java | 53 ++++
.../component/sap/netweaver/NetWeaverEndpoint.java | 64 +++++
.../component/sap/netweaver/NetWeaverProducer.java | 78 ++++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../org/apache/camel/component/sap-netweaver | 18 ++
.../sap/netweaver/NetWeaverFlightDataTest.java | 46 ++++
.../src/test/resources/log4j.properties | 38 +++
9 files changed, 577 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4e7a1d64/components/camel-sap-netweaver/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/pom.xml b/components/camel-sap-netweaver/pom.xml
new file mode 100644
index 0000000..1145c11
--- /dev/null
+++ b/components/camel-sap-netweaver/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>components</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <version>2.12-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-sap-netweaver</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Weather</name>
+ <description>Camel SAP NetWeaver support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.sap.netweaver.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=sap-netweaver</camel.osgi.export.service>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/4e7a1d64/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverComponent.java b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverComponent.java
new file mode 100644
index 0000000..314724a
--- /dev/null
+++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverComponent.java
@@ -0,0 +1,53 @@
+/**
+ * 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.sap.netweaver;
+
+import java.util.Map;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+
+public class NetWeaverComponent extends DefaultComponent {
+
+ private String username;
+ private String password;
+
+ @Override
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+ NetWeaverEndpoint endpoint = new NetWeaverEndpoint(uri, this);
+ endpoint.setUsername(username);
+ endpoint.setPassword(password);
+ setProperties(endpoint, parameters);
+ return endpoint;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4e7a1d64/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java
new file mode 100644
index 0000000..2aed266
--- /dev/null
+++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpoint.java
@@ -0,0 +1,64 @@
+/**
+ * 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.sap.netweaver;
+
+import org.apache.camel.Component;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultEndpoint;
+
+public class NetWeaverEndpoint extends DefaultEndpoint {
+
+ private String username;
+ private String password;
+
+ public NetWeaverEndpoint(String endpointUri, Component component) {
+ super(endpointUri, component);
+ }
+
+ @Override
+ public Producer createProducer() throws Exception {
+ return new NetWeaverProducer(this);
+ }
+
+ @Override
+ public Consumer createConsumer(Processor processor) throws Exception {
+ throw new UnsupportedOperationException("Consumer is not supported");
+ }
+
+ @Override
+ public boolean isSingleton() {
+ return true;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4e7a1d64/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
new file mode 100644
index 0000000..d462a96
--- /dev/null
+++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
@@ -0,0 +1,78 @@
+/**
+ * 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.sap.netweaver;
+
+import java.util.Map;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.util.ServiceHelper;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.ObjectMapper;
+
+public class NetWeaverProducer extends DefaultProducer {
+
+ private Producer http;
+
+ private String url = "https://sapes1.sapdevcenter.com/sap/opu/odata/IWBEP/RMTSAMPLEFLIGHT_2/"
+ + "FlightCollection(AirLineID='AA',FlightConnectionID='0017',FlightDate=datetime'2012-08-29T00%3A00%3A00')/FlightBooking";
+
+ public NetWeaverProducer(Endpoint endpoint) {
+ super(endpoint);
+ }
+
+ @Override
+ public NetWeaverEndpoint getEndpoint() {
+ return (NetWeaverEndpoint) super.getEndpoint();
+ }
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ // call net weaver, and use json data format
+
+ Exchange dummy = getEndpoint().createExchange();
+ dummy.getIn().setHeader("Accept", "application/json");
+ log.info("Calling SAP Net-Weaver");
+ http.process(dummy);
+
+ String json = dummy.hasOut() ? dummy.getOut().getBody(String.class) : dummy.getIn().getBody(String.class);
+ System.out.println(json);
+
+ ObjectMapper mapper = new ObjectMapper();
+ Map map = mapper.readValue(json, Map.class);
+ System.out.println(map);
+
+ exchange.getIn().setBody(map);
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ String s = url + "?authUsername=" + getEndpoint().getUsername() + "&authPassword=" + getEndpoint().getPassword() + "&authMethod=Basic";
+ log.info("Using url: {}", s);
+ http = getEndpoint().getCamelContext().getEndpoint(s).createProducer();
+
+ ServiceHelper.startService(http);
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ ServiceHelper.stopService(http);
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4e7a1d64/components/camel-sap-netweaver/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/resources/META-INF/LICENSE.txt b/components/camel-sap-netweaver/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-sap-netweaver/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/4e7a1d64/components/camel-sap-netweaver/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/resources/META-INF/NOTICE.txt b/components/camel-sap-netweaver/src/main/resources/META-INF/NOTICE.txt
new file mode 100755
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-sap-netweaver/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/4e7a1d64/components/camel-sap-netweaver/src/main/resources/META-INF/services/org/apache/camel/component/sap-netweaver
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/resources/META-INF/services/org/apache/camel/component/sap-netweaver b/components/camel-sap-netweaver/src/main/resources/META-INF/services/org/apache/camel/component/sap-netweaver
new file mode 100644
index 0000000..5e2125b
--- /dev/null
+++ b/components/camel-sap-netweaver/src/main/resources/META-INF/services/org/apache/camel/component/sap-netweaver
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.camel.component.sap.netweaver.NetWeaverComponent
http://git-wip-us.apache.org/repos/asf/camel/blob/4e7a1d64/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java b/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.java
new file mode 100644
index 0000000..33796ab
--- /dev/null
+++ b/components/camel-sap-netweaver/src/test/java/org/apache/camel/component/sap/netweaver/NetWeaverFlightDataTest.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.sap.netweaver;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class NetWeaverFlightDataTest extends CamelTestSupport {
+
+ @Test
+ public void testNetWeaverFlight() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+
+ template.sendBody("direct:start", "Dummy");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").streamCaching()
+ .to("sap-netweaver:foo?username=P1909969254&password=TODO")
+ .to("log:response?showStreams=true")
+ .to("mock:result");
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4e7a1d64/components/camel-sap-netweaver/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/test/resources/log4j.properties b/components/camel-sap-netweaver/src/test/resources/log4j.properties
new file mode 100644
index 0000000..2969721
--- /dev/null
+++ b/components/camel-sap-netweaver/src/test/resources/log4j.properties
@@ -0,0 +1,38 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for testing.
+#
+log4j.rootLogger=INFO, out
+
+#log4j.logger.org.apache.camel=DEBUG
+log4j.logger.org.apache.camel.component.sap.netweaver=DEBUG
+log4j.logger.org.apache.camel.component.http=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/camel-sap-netweaver-test.log
+log4j.appender.file.append=true
[5/5] git commit: CAMEL-6377: Optimized routing engine to reduce
stack frames in use during routing. Work in progress.
Posted by da...@apache.org.
CAMEL-6377: Optimized routing engine to reduce stack frames in use during routing. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13a454b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13a454b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13a454b2
Branch: refs/heads/master
Commit: 13a454b27d55d11c6560b7ecf8a567e4768da827
Parents: 2ca003b
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 28 11:36:29 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 28 11:36:29 2013 +0200
----------------------------------------------------------------------
.../camel/processor/RedeliveryErrorHandler.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/13a454b2/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
index 02b56a8..19acacb 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
@@ -269,14 +269,11 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport impleme
AsyncProcessorHelper.process(this, exchange);
}
- public boolean process(Exchange exchange, final AsyncCallback callback) {
- return processErrorHandler(exchange, callback, new RedeliveryData());
- }
-
/**
* Process the exchange using redelivery error handling.
*/
- protected boolean processErrorHandler(final Exchange exchange, final AsyncCallback callback, final RedeliveryData data) {
+ public boolean process(final Exchange exchange, final AsyncCallback callback) {
+ final RedeliveryData data = new RedeliveryData();
// do a defensive copy of the original Exchange, which is needed for redelivery so we can ensure the
// original Exchange is being redelivered, and not a mutated Exchange
[3/5] git commit: CAMEL-6377: Optimized routing engine to reduce
stack frames in use during routing. Work in progress.
Posted by da...@apache.org.
CAMEL-6377: Optimized routing engine to reduce stack frames in use during routing. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4f67732b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4f67732b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4f67732b
Branch: refs/heads/master
Commit: 4f67732b6302a9675c44b3befbcc6e3a1567d4d6
Parents: 89a575a
Author: Claus Ibsen <da...@apache.org>
Authored: Tue May 28 10:44:25 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue May 28 10:44:25 2013 +0200
----------------------------------------------------------------------
.../camel/impl/EventDrivenConsumerRoute.java | 19 +++---
.../camel/processor/CamelInternalProcessor.java | 2 +-
.../processor/interceptor/DefaultChannel.java | 53 ++++++---------
.../java/org/apache/camel/util/ServiceHelper.java | 16 +++--
.../management/ManagedRouteDumpStatsAsXmlTest.java | 4 +-
.../apache/camel/processor/ChoiceWithEndTest.java | 1 -
.../apache/camel/processor/SplitWithEndTest.java | 1 -
7 files changed, 46 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4f67732b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
index b733798..c9e2709 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
@@ -76,17 +76,16 @@ public class EventDrivenConsumerRoute extends DefaultRoute {
public Navigate<Processor> navigate() {
Processor answer = getProcessor();
- // we do not want to navigate the instrument and inflight processors
- // which is the first 2 delegate async processors, so skip them
- // skip the instrumentation processor if this route was wrapped by one
- if (answer instanceof DelegateAsyncProcessor) {
- answer = ((DelegateAsyncProcessor) answer).getProcessor();
- if (answer instanceof DelegateAsyncProcessor) {
- answer = ((DelegateAsyncProcessor) answer).getProcessor();
- }
- }
-
+ // we want navigating routes to be easy, so skip the initial channel
+ // and navigate to its output where it all starts from end user point of view
if (answer instanceof Navigate) {
+ Navigate<Processor> nav = (Navigate<Processor>) answer;
+ if (nav.next().size() == 1) {
+ Object first = nav.next().get(0);
+ if (first instanceof Navigate) {
+ return (Navigate<Processor>) first;
+ }
+ }
return (Navigate<Processor>) answer;
}
return null;
http://git-wip-us.apache.org/repos/asf/camel/blob/4f67732b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 3aa0f91..d2eff83 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* read the source code of this class about the debugging tips, which you can find in the
* {@link #process(org.apache.camel.Exchange, org.apache.camel.AsyncCallback)} method.
*/
-public final class CamelInternalProcessor extends DelegateAsyncProcessor {
+public class CamelInternalProcessor extends DelegateAsyncProcessor {
private static final Logger LOG = LoggerFactory.getLogger(CamelInternalProcessor.class);
private final List<CamelInternalProcessorTask> tasks = new ArrayList<CamelInternalProcessorTask>();
http://git-wip-us.apache.org/repos/asf/camel/blob/4f67732b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
index a6282fb..fa6656b 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
@@ -40,8 +39,6 @@ import org.apache.camel.processor.WrapProcessor;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.RouteContext;
-import org.apache.camel.support.ServiceSupport;
-import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.OrderedComparator;
import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
@@ -59,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
-public class DefaultChannel extends ServiceSupport implements ModelChannel {
+public class DefaultChannel extends CamelInternalProcessor implements ModelChannel {
private static final transient Logger LOG = LoggerFactory.getLogger(DefaultChannel.class);
@@ -73,17 +70,6 @@ public class DefaultChannel extends ServiceSupport implements ModelChannel {
private ProcessorDefinition<?> childDefinition;
private CamelContext camelContext;
private RouteContext routeContext;
- private CamelInternalProcessor internalProcessor;
-
- public List<Processor> next() {
- List<Processor> answer = new ArrayList<Processor>(1);
- answer.add(nextProcessor);
- return answer;
- }
-
- public boolean hasNext() {
- return nextProcessor != null;
- }
public void setNextProcessor(Processor next) {
this.nextProcessor = next;
@@ -98,6 +84,21 @@ public class DefaultChannel extends ServiceSupport implements ModelChannel {
return errorHandler != null ? errorHandler : output;
}
+ @Override
+ public boolean hasNext() {
+ return nextProcessor != null;
+ }
+
+ @Override
+ public List<Processor> next() {
+ if (!hasNext()) {
+ return null;
+ }
+ List<Processor> answer = new ArrayList<Processor>(1);
+ answer.add(nextProcessor);
+ return answer;
+ }
+
public void setOutput(Processor output) {
this.output = output;
}
@@ -149,21 +150,20 @@ public class DefaultChannel extends ServiceSupport implements ModelChannel {
@Override
protected void doStart() throws Exception {
- // the output has now been created, so assign the output to the internal processor
- internalProcessor.setProcessor(getOutput());
- ServiceHelper.startServices(errorHandler, output, internalProcessor);
+ // the output has now been created, so assign the output as the processor
+ setProcessor(getOutput());
+ ServiceHelper.startServices(errorHandler, output);
}
@Override
protected void doStop() throws Exception {
- ServiceHelper.stopServices(output, errorHandler, internalProcessor);
+ ServiceHelper.stopServices(output, errorHandler);
}
public void initChannel(ProcessorDefinition<?> outputDefinition, RouteContext routeContext) throws Exception {
this.routeContext = routeContext;
this.definition = outputDefinition;
this.camelContext = routeContext.getCamelContext();
- this.internalProcessor = new CamelInternalProcessor();
Processor target = nextProcessor;
Processor next;
@@ -210,13 +210,13 @@ public class DefaultChannel extends ServiceSupport implements ModelChannel {
first = route.getOutputs().get(0) == definition;
}
- internalProcessor.addTask(new CamelInternalProcessor.BacklogTracerTask(backlogTracer.getQueue(), backlogTracer, targetOutputDef, route, first));
+ addTask(new CamelInternalProcessor.BacklogTracerTask(backlogTracer.getQueue(), backlogTracer, targetOutputDef, route, first));
// add debugger as well so we have both tracing and debugging out of the box
InterceptStrategy debugger = getOrCreateBacklogDebugger();
if (debugger instanceof BacklogDebugger) {
BacklogDebugger backlogDebugger = (BacklogDebugger) debugger;
- internalProcessor.addTask(new CamelInternalProcessor.BacklogDebuggerTask(backlogDebugger, target, targetOutputDef));
+ addTask(new CamelInternalProcessor.BacklogDebuggerTask(backlogDebugger, target, targetOutputDef));
}
}
@@ -380,15 +380,6 @@ public class DefaultChannel extends ServiceSupport implements ModelChannel {
return debugger;
}
- public void process(Exchange exchange) throws Exception {
- AsyncProcessorHelper.process(this, exchange);
- }
-
- public boolean process(final Exchange exchange, final AsyncCallback callback) {
- // TODO: We do not need to have DefaultChannel wrapped in the routes, but can just rely on CamelInternalProcessor
- return internalProcessor.process(exchange, callback);
- }
-
@Override
public String toString() {
// just output the next processor as all the interceptors and error handler is just too verbose
http://git-wip-us.apache.org/repos/asf/camel/blob/4f67732b/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java b/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
index 1c6877b..d5f3b39 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
@@ -391,11 +391,17 @@ public final class ServiceHelper {
if (nav.hasNext()) {
List<?> children = nav.next();
for (Object child : children) {
- // special for error handler as they are tied to the Channel
- if (child instanceof Channel && includeErrorHandler) {
- Processor errorHandler = ((Channel) child).getErrorHandler();
- if (errorHandler != null && errorHandler instanceof Service) {
- services.add((Service) errorHandler);
+ if (child instanceof Channel) {
+ if (includeErrorHandler) {
+ // special for error handler as they are tied to the Channel
+ Processor errorHandler = ((Channel) child).getErrorHandler();
+ if (errorHandler != null && errorHandler instanceof Service) {
+ services.add((Service) errorHandler);
+ }
+ }
+ Processor next = ((Channel) child).getNextProcessor();
+ if (next != null && next instanceof Service) {
+ services.add((Service) next);
}
}
if (child instanceof Service) {
http://git-wip-us.apache.org/repos/asf/camel/blob/4f67732b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java
index edb8e8d..12f9c74 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteDumpStatsAsXmlTest.java
@@ -55,7 +55,9 @@ public class ManagedRouteDumpStatsAsXmlTest extends ManagementTestSupport {
@Override
public void configure() throws Exception {
from("direct:start").routeId("foo")
- .to("log:foo").delay(100).to("mock:result");
+ .to("log:foo").id("to-log")
+ .delay(100)
+ .to("mock:result").id("to-mock");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4f67732b/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java b/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
index aba0408..ae7ace9 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
@@ -55,7 +55,6 @@ public class ChoiceWithEndTest extends ContextTestSupport {
}
}
return answer;
-
}
public void testChoiceHello() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/4f67732b/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java
index 3b34ad2..b4b4792 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java
@@ -56,7 +56,6 @@ public class SplitWithEndTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
}
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {