You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/04/30 05:29:05 UTC
svn commit: r652240 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/processor/
camel-core/src/main/java/org/apache/camel/util/
camel-core/src/test/java/org/apache/camel/issues/ came...
Author: ningjiang
Date: Tue Apr 29 20:29:04 2008
New Revision: 652240
URL: http://svn.apache.org/viewvc?rev=652240&view=rev
Log:
Applied the svn auto properties
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java (props changed)
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java (props changed)
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/Out.java (props changed)
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java (contents, props changed)
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetOutBodyTest.java (props changed)
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformProcessorTest.java (props changed)
activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/transform.xml (props changed)
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java (contents, props changed)
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java (contents, props changed)
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java (contents, props changed)
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java (contents, props changed)
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java (contents, props changed)
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java (contents, props changed)
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java (contents, props changed)
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/DeferredRequestReplyMap.java (props changed)
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java (props changed)
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsProviderTest.java (contents, props changed)
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java (contents, props changed)
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converters/ScalaTypeConverter.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceType.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorType.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteType.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitterType.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/ScalaDsl.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/ScalaExpression.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Wrapper.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/JXPath.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/XPath.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/builder/RouteBuilderUnwrapTest.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Envelope.scala (props changed)
activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Person.scala (props changed)
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationComponent.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationExchange.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java (props changed)
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/transformWithExpressionContext.xml (props changed)
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/Out.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/Out.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java Tue Apr 29 20:29:04 2008
@@ -24,7 +24,7 @@
import org.apache.camel.component.mock.MockEndpoint;
/**
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class DavidSiefertTest extends ContextTestSupport {
protected static Object expectedBody = "Some Output";
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetOutBodyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetOutBodyTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformProcessorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformProcessorTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/transform.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/transform.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/transform.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java Tue Apr 29 20:29:04 2008
@@ -1,55 +1,55 @@
-/**
- * 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.jetty;
-
-import java.net.URL;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.mortbay.jetty.security.SslSocketConnector;
-
-public class ExplicitHttpsRouteTest extends HttpsRouteTest {
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() {
-
- SslSocketConnector sslSocketConnector = new SslSocketConnector();
- sslSocketConnector.setKeyPassword(pwd);
- sslSocketConnector.setPassword(pwd);
- URL keyStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks");
- sslSocketConnector.setKeystore(keyStoreUrl.getPath());
- sslSocketConnector.setTruststoreType("JKS");
-
- JettyHttpComponent componentJetty = (JettyHttpComponent) context.getComponent("jetty");
- componentJetty.setSslSocketConnector(sslSocketConnector);
-
- from("jetty:https://localhost:8080/test").to("mock:a");
-
- Processor proc = new Processor() {
- public void process(Exchange exchange) throws Exception {
- exchange.getOut(true).setBody("<b>Hello World</b>");
- }
- };
- from("jetty:https://localhost:8080/hello").process(proc);
- }
- };
- }
-}
-
+/**
+ * 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.jetty;
+
+import java.net.URL;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.mortbay.jetty.security.SslSocketConnector;
+
+public class ExplicitHttpsRouteTest extends HttpsRouteTest {
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+
+ SslSocketConnector sslSocketConnector = new SslSocketConnector();
+ sslSocketConnector.setKeyPassword(pwd);
+ sslSocketConnector.setPassword(pwd);
+ URL keyStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks");
+ sslSocketConnector.setKeystore(keyStoreUrl.getPath());
+ sslSocketConnector.setTruststoreType("JKS");
+
+ JettyHttpComponent componentJetty = (JettyHttpComponent) context.getComponent("jetty");
+ componentJetty.setSslSocketConnector(sslSocketConnector);
+
+ from("jetty:https://localhost:8080/test").to("mock:a");
+
+ Processor proc = new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getOut(true).setBody("<b>Hello World</b>");
+ }
+ };
+ from("jetty:https://localhost:8080/hello").process(proc);
+ }
+ };
+ }
+}
+
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java Tue Apr 29 20:29:04 2008
@@ -1,157 +1,157 @@
-/**
- * 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.jetty;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.SocketException;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-
-
-public class HttpsRouteTest extends ContextTestSupport {
- private static final String NULL_VALUE_MARKER = ContextTestSupport.class.getCanonicalName();
- protected String expectedBody = "<hello>world!</hello>";
- protected String pwd = "changeit";
- protected Properties originalValues = new Properties();
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- // ensure jsse clients can validate the self signed dummy localhost cert,
- // use the server keystore as the trust store for these tests
- URL trustStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks");
- setSystemProp("javax.net.ssl.trustStore", trustStoreUrl.getPath());
- }
-
- @Override
- protected void tearDown() throws Exception {
- restoreSystemProperties();
- super.tearDown();
- }
-
- private void setSystemProp(String key, String value) {
- String originalValue = System.setProperty(key, value);
- originalValues.put(key, originalValue != null ? originalValue : NULL_VALUE_MARKER);
- }
-
- private void restoreSystemProperties() {
- for (Object key : originalValues.keySet()) {
- Object value = (String) originalValues.get(key);
- if (NULL_VALUE_MARKER.equals(value)) {
- System.getProperties().remove(key);
- } else {
- System.setProperty((String)key, (String)value);
- }
- }
- }
-
- public void testEndpoint() throws Exception {
- MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a", MockEndpoint.class);
- mockEndpoint.expectedBodiesReceived(expectedBody);
-
- invokeHttpEndpoint();
-
- mockEndpoint.assertIsSatisfied();
- List<Exchange> list = mockEndpoint.getReceivedExchanges();
- Exchange exchange = list.get(0);
- assertNotNull("exchange", exchange);
-
- Message in = exchange.getIn();
- assertNotNull("in", in);
-
- Map<String, Object> headers = in.getHeaders();
-
- log.info("Headers: " + headers);
-
- assertTrue("Should be more than one header but was: " + headers, headers.size() > 0);
- }
-
-
- public void testEndpointWithoutHttps() {
- MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a", MockEndpoint.class);
- try {
- template.sendBodyAndHeader("jetty:http://localhost:8080/test", expectedBody, "Content-Type", "application/xml");
- fail("expect exception on access to https endpoint via http");
- } catch (RuntimeCamelException expected) {
- }
- assertTrue("mock endpoint was not called", mockEndpoint.getExchanges().isEmpty());
- }
-
- public void testHelloEndpoint() throws Exception {
-
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- InputStream is = new URL("https://localhost:8080/hello").openStream();
- int c;
- while ((c = is.read()) >= 0) {
- os.write(c);
- }
-
- String data = new String(os.toByteArray());
- assertEquals("<b>Hello World</b>", data);
-
- }
-
- public void testHelloEndpointWithoutHttps() throws Exception {
- try {
- new URL("http://localhost:8080/hello").openStream();
- fail("expected SocketException on use ot http");
- } catch (SocketException expected) {
- }
-
-
- }
-
- protected void invokeHttpEndpoint() throws IOException {
- template.sendBodyAndHeader("jetty:https://localhost:8080/test", expectedBody, "Content-Type", "application/xml");
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() {
-
- JettyHttpComponent componentJetty = (JettyHttpComponent) context.getComponent("jetty");
- componentJetty.setSslPassword(pwd);
- componentJetty.setSslKeyPassword(pwd);
- URL keyStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks");
- componentJetty.setKeystore(keyStoreUrl.getPath());
-
- from("jetty:https://localhost:8080/test").to("mock:a");
-
- Processor proc = new Processor() {
- public void process(Exchange exchange) throws Exception {
- exchange.getOut(true).setBody("<b>Hello World</b>");
- }
- };
- from("jetty:https://localhost:8080/hello").process(proc);
- }
- };
- }
-}
-
+/**
+ * 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.jetty;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.SocketException;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+
+public class HttpsRouteTest extends ContextTestSupport {
+ private static final String NULL_VALUE_MARKER = ContextTestSupport.class.getCanonicalName();
+ protected String expectedBody = "<hello>world!</hello>";
+ protected String pwd = "changeit";
+ protected Properties originalValues = new Properties();
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ // ensure jsse clients can validate the self signed dummy localhost cert,
+ // use the server keystore as the trust store for these tests
+ URL trustStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks");
+ setSystemProp("javax.net.ssl.trustStore", trustStoreUrl.getPath());
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ restoreSystemProperties();
+ super.tearDown();
+ }
+
+ private void setSystemProp(String key, String value) {
+ String originalValue = System.setProperty(key, value);
+ originalValues.put(key, originalValue != null ? originalValue : NULL_VALUE_MARKER);
+ }
+
+ private void restoreSystemProperties() {
+ for (Object key : originalValues.keySet()) {
+ Object value = (String) originalValues.get(key);
+ if (NULL_VALUE_MARKER.equals(value)) {
+ System.getProperties().remove(key);
+ } else {
+ System.setProperty((String)key, (String)value);
+ }
+ }
+ }
+
+ public void testEndpoint() throws Exception {
+ MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a", MockEndpoint.class);
+ mockEndpoint.expectedBodiesReceived(expectedBody);
+
+ invokeHttpEndpoint();
+
+ mockEndpoint.assertIsSatisfied();
+ List<Exchange> list = mockEndpoint.getReceivedExchanges();
+ Exchange exchange = list.get(0);
+ assertNotNull("exchange", exchange);
+
+ Message in = exchange.getIn();
+ assertNotNull("in", in);
+
+ Map<String, Object> headers = in.getHeaders();
+
+ log.info("Headers: " + headers);
+
+ assertTrue("Should be more than one header but was: " + headers, headers.size() > 0);
+ }
+
+
+ public void testEndpointWithoutHttps() {
+ MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a", MockEndpoint.class);
+ try {
+ template.sendBodyAndHeader("jetty:http://localhost:8080/test", expectedBody, "Content-Type", "application/xml");
+ fail("expect exception on access to https endpoint via http");
+ } catch (RuntimeCamelException expected) {
+ }
+ assertTrue("mock endpoint was not called", mockEndpoint.getExchanges().isEmpty());
+ }
+
+ public void testHelloEndpoint() throws Exception {
+
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ InputStream is = new URL("https://localhost:8080/hello").openStream();
+ int c;
+ while ((c = is.read()) >= 0) {
+ os.write(c);
+ }
+
+ String data = new String(os.toByteArray());
+ assertEquals("<b>Hello World</b>", data);
+
+ }
+
+ public void testHelloEndpointWithoutHttps() throws Exception {
+ try {
+ new URL("http://localhost:8080/hello").openStream();
+ fail("expected SocketException on use ot http");
+ } catch (SocketException expected) {
+ }
+
+
+ }
+
+ protected void invokeHttpEndpoint() throws IOException {
+ template.sendBodyAndHeader("jetty:https://localhost:8080/test", expectedBody, "Content-Type", "application/xml");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+
+ JettyHttpComponent componentJetty = (JettyHttpComponent) context.getComponent("jetty");
+ componentJetty.setSslPassword(pwd);
+ componentJetty.setSslKeyPassword(pwd);
+ URL keyStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks");
+ componentJetty.setKeystore(keyStoreUrl.getPath());
+
+ from("jetty:https://localhost:8080/test").to("mock:a");
+
+ Processor proc = new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getOut(true).setBody("<b>Hello World</b>");
+ }
+ };
+ from("jetty:https://localhost:8080/hello").process(proc);
+ }
+ };
+ }
+}
+
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java Tue Apr 29 20:29:04 2008
@@ -24,7 +24,7 @@
* An optional interface that a {@link JmsEndpoint} may implement to return the
* underlying {@link Destination} object
*
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public interface DestinationEndpoint {
Destination getJmsDestination(Session session) throws JMSException;
Propchange: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java Tue Apr 29 20:29:04 2008
@@ -19,7 +19,7 @@
/**
* A processor which is capable of transforming the
*
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class DestinationTransformProcessor {
}
Propchange: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationTransformProcessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java Tue Apr 29 20:29:04 2008
@@ -28,7 +28,7 @@
* A class which represents some metadata about the underlying JMS provider
* so that we can properly bridge JMS providers such as for dealing with temporary destinations.
*
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class JmsProviderMetadata {
private Class<? extends TemporaryQueue> temporaryQueueType;
Propchange: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java Tue Apr 29 20:29:04 2008
@@ -28,7 +28,7 @@
* A <a href="http://activemq.apache.org/jms.html">JMS Endpoint</a>
* for working with a {@link TemporaryQueue}
*
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
// TODO need to be really careful to always use the same Connection otherwise the destination goes stale
public class JmsTemporaryQueueEndpoint extends JmsQueueEndpoint implements DestinationEndpoint {
Propchange: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryQueueEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java Tue Apr 29 20:29:04 2008
@@ -28,7 +28,7 @@
* A <a href="http://activemq.apache.org/jms.html">JMS Endpoint</a>
* for working with a {@link TemporaryTopic}
*
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
// TODO need to be really careful to always use the same Connection otherwise the destination goes stale
public class JmsTemporaryTopicEndpoint extends JmsEndpoint implements DestinationEndpoint {
Propchange: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsTemporaryTopicEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/DeferredRequestReplyMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/requestor/DeferredRequestReplyMap.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsProviderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsProviderTest.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsProviderTest.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsProviderTest.java Tue Apr 29 20:29:04 2008
@@ -29,7 +29,7 @@
import org.apache.camel.component.jms.JmsProviderMetadata;
/**
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class JmsProviderTest extends ContextTestSupport {
public void testTemporaryDestinationTypes() throws Exception {
Propchange: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsProviderTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java Tue Apr 29 20:29:04 2008
@@ -22,7 +22,7 @@
import org.apache.commons.logging.LogFactory;
/**
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class TemporaryTopicRouteTest extends TemporaryQueueRouteTest {
private static final transient Log LOG = LogFactory.getLog(TemporaryQueueRouteTest.class);
Propchange: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converters/ScalaTypeConverter.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converters/ScalaTypeConverter.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceType.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceType.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorType.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorType.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteType.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteType.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitterType.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitterType.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/ScalaDsl.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/ScalaDsl.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/ScalaExpression.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/ScalaExpression.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Wrapper.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/Wrapper.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/JXPath.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/JXPath.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/XPath.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/XPath.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/ScalaTypeConverterTest.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/builder/RouteBuilderUnwrapTest.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/builder/RouteBuilderUnwrapTest.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Envelope.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Envelope.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Person.scala
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/test/Person.scala
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationBinding.java Tue Apr 29 20:29:04 2008
@@ -23,7 +23,7 @@
/**
* The helper class for Mapping between the Spring Integration message and
* the Camel Message
- * @version $Revision
+ * @version $Revision$
*/
public final class SpringIntegrationBinding {
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationComponent.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationComponent.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationComponent.java Tue Apr 29 20:29:04 2008
@@ -24,7 +24,7 @@
* Represents the component that manages {@link SpringIntegrationEndpoint}. It holds the
* list of named direct endpoints.
*
- * @version $Revision
+ * @version $Revision$
*/
public class SpringIntegrationComponent extends DefaultComponent<SpringIntegrationExchange> {
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java Tue Apr 29 20:29:04 2008
@@ -33,7 +33,7 @@
* Please specify the inputChannel in the endpoint url for this consumer.
* If the message pattern is inOut, the outputChannel property
* should be set for the outgoing message.
- * @version $Revision
+ * @version $Revision$
*/
public class SpringIntegrationConsumer extends ScheduledPollConsumer<SpringIntegrationExchange> {
private SpringCamelContext context;
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java Tue Apr 29 20:29:04 2008
@@ -29,7 +29,7 @@
/**
* Defines the <a href="http://activemq.apache.org/camel/springIntergration.html">Spring Intergration Endpoint</a>
*
- * @version $Revision
+ * @version $Revision$
*/
public class SpringIntegrationEndpoint extends DefaultEndpoint<SpringIntegrationExchange> {
private static final Log LOG = LogFactory.getLog(SpringIntegrationEndpoint.class);
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationExchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationExchange.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationExchange.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationExchange.java Tue Apr 29 20:29:04 2008
@@ -27,7 +27,7 @@
* An {@link Exchange} for working with Spring Integration endpoints which exposes the underlying
* Spring messages via {@link #getInMessage()} and {@link #getOutMessage()}
*
- * @version $Revision
+ * @version $Revision$
*/
public class SpringIntegrationExchange extends DefaultExchange {
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java Tue Apr 29 20:29:04 2008
@@ -26,7 +26,7 @@
* The Message {@link DefaultMessage} implementation
* for accessing the SpringIntegrationMessage
*
- * @version $Revision
+ * @version $Revision$
*/
public class SpringIntegrationMessage extends DefaultMessage {
private org.springframework.integration.message.Message siMessage;
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java?rev=652240&r1=652239&r2=652240&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java Tue Apr 29 20:29:04 2008
@@ -32,8 +32,8 @@
* A producer of exchanges for the Spring Integration
* Please specify the outputChannel in the endpoint url for this producer.
* If the message pattern is inOut, the inputChannel property
- * should be set for the receive the response message.
- * @version $Revision
+ * should be set for receiving the response message.
+ * @version $Revision$
*/
public class SpringIntegrationProducer extends DefaultProducer<SpringIntegrationExchange> {
private static final transient Log LOG = LogFactory.getLog(SpringIntegrationProducer.class);
Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/transformWithExpressionContext.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/transformWithExpressionContext.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/transformWithExpressionContext.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml