camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r908377 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/impl/converter/ camel-core/src/main/java/org/apache/camel/model/ camel-core/src/test/java/org/apache/camel/processor/ components...
Date Wed, 10 Feb 2010 07:57:08 GMT
Author: ningjiang
Date: Wed Feb 10 07:57:06 2010
New Revision: 908377

URL: http://svn.apache.org/viewvc?rev=908377&view=rev
Log:
Removed the useless svn:mergeinfo

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/FallbackConverter.java   (props
changed)
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
  (props changed)
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
  (props changed)
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
  (props changed)
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
  (props changed)
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
  (props changed)
    camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/Constants.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CustomHeaderFilter.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
  (props changed)
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
  (props changed)
    camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java
  (props changed)
    camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java
  (props changed)
    camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcEndpointTest.java
  (props changed)
    camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
  (props changed)
    camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ServiceRegistryTest.java
  (props changed)
    camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointTest.java
  (props changed)
    camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfix/converter/QuickFixConverter.java
  (props changed)
    camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfix/example/
  (props changed)
    camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
  (props changed)
    camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java
  (props changed)
    camel/trunk/components/camel-servlet/src/test/resources/log4j.properties   (props changed)
    camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
  (props changed)
    camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/
  (props changed)
    camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/CustomerServerBean.java
  (props changed)
    camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
  (props changed)
    camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalSetterTest.java
  (props changed)
    camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
  (props changed)
    camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
  (props changed)
    camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
  (props changed)
    camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
  (props changed)
    camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java
  (props changed)
    camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/
  (props changed)
    camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/ContextConfig.java
  (props changed)
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/NodeIdReferenceTest.java
  (props changed)
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/NodeIdReferenceTest-context.xml
  (props changed)
    camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java
  (props changed)
    camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
  (props changed)
    camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityEndpointTest.java
  (props changed)
    camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkEndpointTest.java
  (props changed)
    camel/trunk/etc/eclipse/Camel.importorder   (props changed)
    camel/trunk/etc/eclipse/CamelCodeFormatter.xml   (props changed)
    camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelCXFProviderRouteConfig.xml
  (props changed)
    camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
  (props changed)
    camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
  (props changed)
    camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
  (props changed)
    camel/trunk/examples/camel-example-guice-jms/src/main/resources/guicejndi.properties 
 (props changed)
    camel/trunk/examples/camel-example-reportincident/src/main/resources/etc/MailBody.vm 
 (props changed)
    camel/trunk/examples/camel-example-reportincident/src/main/resources/etc/report_incident.wsdl
  (props changed)
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jpa/springJpaRouteContext.xml
  (props changed)
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java
  (props changed)
    camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml
  (props changed)
    camel/trunk/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/IMAPProvider.java
  (props changed)
    camel/trunk/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/POP3Provider.java
  (props changed)
    camel/trunk/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/SMTPProvider.java
  (props changed)

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/FallbackConverter.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEndpointTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/Constants.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CustomHeaderFilter.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelTransportTestSupport.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcEndpointTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ServiceRegistryTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzEndpointTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfix/converter/QuickFixConverter.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfix/example/
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEndpointTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-servlet/src/test/resources/log4j.properties
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/CustomerServerBean.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalSetterTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/TestUtil.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-soap/src/test/resources/org/apache/camel/dataformat/soap/
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/ContextConfig.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/NodeIdReferenceTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/NodeIdReferenceTest-context.xml
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityEndpointTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/GoogleTalkEndpointTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/etc/eclipse/Camel.importorder
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/etc/eclipse/CamelCodeFormatter.xml
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CamelTransportSpringConfig.xml
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/CxfRouteCamelContext.xml
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/examples/camel-example-cxf/src/main/resources/META-INF/spring/JAXRSCamelContext.xml
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/examples/camel-example-guice-jms/src/main/resources/guicejndi.properties
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/examples/camel-example-reportincident/src/main/resources/etc/MailBody.vm
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/examples/camel-example-reportincident/src/main/resources/etc/report_incident.wsdl
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jpa/springJpaRouteContext.xml
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/ftp/SpringFtpEndpointTest-context.xml
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/IMAPProvider.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/POP3Provider.java
            ('svn:mergeinfo' removed)

Propchange: camel/trunk/tests/test-bundles/mock-javamail_1.7/src/main/java/org/jvnet/mock_javamail/provider/SMTPProvider.java
            ('svn:mergeinfo' removed)



Mime
View raw message