Author: ningjiang
Date: Wed Apr 22 09:46:33 2009
New Revision: 767437
URL: http://svn.apache.org/viewvc?rev=767437&view=rev
Log:
Fixed the svn properties
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
(props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
(contents, props changed)
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java
(props changed)
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingTest.java
(props changed)
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
(props changed)
camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
(props changed)
camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java
(props changed)
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringResequencerTest-context.xml
(contents, props changed)
camel/branches/camel-1.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java
(props changed)
camel/branches/camel-1.x/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
(props changed)
camel/branches/camel-1.x/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityEncodingTest.java
(props changed)
Propchange:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/interceptor/StreamCaching.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java?rev=767437&r1=767436&r2=767437&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
Wed Apr 22 09:46:33 2009
@@ -23,7 +23,7 @@
/**
* Some helper methods when working with {...@link org.apache.camel.Message}.
*
- * @version $Revision: 740251 $
+ * @version $Revision$
*/
public final class MessageHelper {
Propchange:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RegExRouteTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringResequencerTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringResequencerTest-context.xml?rev=767437&r1=767436&r2=767437&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringResequencerTest-context.xml
(original)
+++
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringResequencerTest-context.xml
Wed Apr 22 09:46:33 2009
@@ -1,62 +1,62 @@
-<?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";
- xsi:schemaLocation="
-http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd";>
-
- <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
- <jmxAgent id="agent" disabled="true" />
- <route>
- <from uri="activemq:queue:in1"/>
- <resequencer>
- <simple>body</simple>
- <to uri="mock:result"/>
- <batch-config batchSize="100" batchTimeout="100"/>
- </resequencer>
-
- </route>
-
- <route>
- <from uri="activemq:queue:in2"/>
- <resequencer>
- <simple>header.num</simple>
- <to uri="mock:result"/>
- <stream-config timeout="2000"/>
- </resequencer>
- </route>
-
- </camelContext>
-
-
- <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL"
value="vm://localhost?broker.persistent=false&broker.useJmx=false"/>
- </bean>
-
- <bean id="jmsConfig"
class="org.apache.camel.component.jms.JmsConfiguration">
- <property name="connectionFactory" ref="jmsConnectionFactory"/>
- <property name="transacted" value="false"/>
- <property name="concurrentConsumers" value="10"/>
- </bean>
-
- <bean id="activemq" class="org.apache.camel.component.jms.JmsComponent">
- <property name="configuration" ref="jmsConfig"/>
- </bean>
-
-</beans>
+<?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";
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd";>
+
+ <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <jmxAgent id="agent" disabled="true" />
+ <route>
+ <from uri="activemq:queue:in1"/>
+ <resequencer>
+ <simple>body</simple>
+ <to uri="mock:result"/>
+ <batch-config batchSize="100" batchTimeout="100"/>
+ </resequencer>
+
+ </route>
+
+ <route>
+ <from uri="activemq:queue:in2"/>
+ <resequencer>
+ <simple>header.num</simple>
+ <to uri="mock:result"/>
+ <stream-config timeout="2000"/>
+ </resequencer>
+ </route>
+
+ </camelContext>
+
+
+ <bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL"
value="vm://localhost?broker.persistent=false&broker.useJmx=false"/>
+ </bean>
+
+ <bean id="jmsConfig"
class="org.apache.camel.component.jms.JmsConfiguration">
+ <property name="connectionFactory" ref="jmsConnectionFactory"/>
+ <property name="transacted" value="false"/>
+ <property name="concurrentConsumers" value="10"/>
+ </bean>
+
+ <bean id="activemq" class="org.apache.camel.component.jms.JmsComponent">
+ <property name="configuration" ref="jmsConfig"/>
+ </bean>
+
+</beans>
Propchange:
camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/JmsSpringResequencerTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/branches/camel-1.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/branches/camel-1.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/StatefulCamelJob.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/branches/camel-1.x/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/branches/camel-1.x/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/StatefulQuartzRouteTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/branches/camel-1.x/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityEncodingTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
