Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/Order.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/Order.java (original) +++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsdl/Order.java Tue Aug 23 13:27:43 2011 @@ -1,47 +1,47 @@ -/** - * 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.cxf.wsdl; - -import javax.xml.bind.annotation.XmlRootElement; - -public class Order { - - String customerName; - String productName; - - public String getCustomerName() { - return customerName; - } - - public void setCustomerName(String customerName) { - this.customerName = customerName; - } - - public String getProductName() { - return productName; - } - - public void setProductName(String productName) { - this.productName = productName; - } - - @Override - public String toString() { - return "order[" + customerName + "," + productName + "]"; - } - -} +/** + * 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.cxf.wsdl; + +import javax.xml.bind.annotation.XmlRootElement; + +public class Order { + + String customerName; + String productName; + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + @Override + public String toString() { + return "order[" + customerName + "," + productName + "]"; + } + +}
Modified: camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepository.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepository.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepository.java (original) +++ camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepository.java Tue Aug 23 13:27:43 2011 @@ -18,8 +18,8 @@ package org.apache.camel.processor.idemp import com.hazelcast.core.Hazelcast; import com.hazelcast.core.IMap; -import org.apache.camel.impl.ServiceSupport; import org.apache.camel.spi.IdempotentRepository; +import org.apache.camel.support.ServiceSupport; public class HazelcastIdempotentRepository extends ServiceSupport implements IdempotentRepository<String> { Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java (original) +++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java Tue Aug 23 13:27:43 2011 @@ -46,10 +46,10 @@ import org.apache.camel.component.jms.re import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.impl.DefaultExchange; import org.apache.camel.impl.SynchronousDelegateProducer; -import org.apache.camel.management.ManagedAttribute; -import org.apache.camel.management.ManagedResource; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; +import org.apache.camel.spi.management.ManagedAttribute; +import org.apache.camel.spi.management.ManagedResource; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.ServiceHelper; import org.slf4j.Logger; Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java (original) +++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java Tue Aug 23 13:27:43 2011 @@ -23,10 +23,10 @@ import javax.jms.Queue; import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.management.ManagedAttribute; -import org.apache.camel.management.ManagedOperation; -import org.apache.camel.management.ManagedResource; import org.apache.camel.spi.BrowsableEndpoint; +import org.apache.camel.spi.management.ManagedAttribute; +import org.apache.camel.spi.management.ManagedOperation; +import org.apache.camel.spi.management.ManagedResource; import org.apache.camel.util.MessageHelper; import org.springframework.jms.core.JmsOperations; Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java (original) +++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java Tue Aug 23 13:27:43 2011 @@ -29,7 +29,7 @@ import org.apache.camel.ExchangeTimedOut import org.apache.camel.component.jms.JmsEndpoint; import org.apache.camel.component.jms.JmsMessage; import org.apache.camel.component.jms.JmsMessageHelper; -import org.apache.camel.impl.ServiceSupport; +import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.ServiceHelper; import org.slf4j.Logger; Modified: camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java (original) +++ camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/processor/idempotent/jpa/JpaMessageIdRepository.java Tue Aug 23 13:27:43 2011 @@ -18,14 +18,15 @@ package org.apache.camel.processor.idemp import java.util.Date; import java.util.List; + import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; -import org.apache.camel.impl.ServiceSupport; -import org.apache.camel.management.ManagedAttribute; -import org.apache.camel.management.ManagedOperation; -import org.apache.camel.management.ManagedResource; import org.apache.camel.spi.IdempotentRepository; +import org.apache.camel.spi.management.ManagedAttribute; +import org.apache.camel.spi.management.ManagedOperation; +import org.apache.camel.spi.management.ManagedResource; +import org.apache.camel.support.ServiceSupport; import org.springframework.orm.jpa.JpaTemplate; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.transaction.TransactionDefinition; Modified: camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java (original) +++ camel/trunk/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java Tue Aug 23 13:27:43 2011 @@ -22,7 +22,6 @@ import com.googlecode.jsendnsca.core.Lev import com.googlecode.jsendnsca.core.MessagePayload; import com.googlecode.jsendnsca.core.NagiosPassiveCheckSender; import com.googlecode.jsendnsca.core.NagiosSettings; -import org.apache.camel.management.EventNotifierSupport; import org.apache.camel.management.event.CamelContextStartupFailureEvent; import org.apache.camel.management.event.CamelContextStopFailureEvent; import org.apache.camel.management.event.ExchangeFailedEvent; @@ -30,6 +29,7 @@ import org.apache.camel.management.event import org.apache.camel.management.event.ExchangeRedeliveryEvent; import org.apache.camel.management.event.ServiceStartupFailureEvent; import org.apache.camel.management.event.ServiceStopFailureEvent; +import org.apache.camel.support.EventNotifierSupport; /** * An {@link org.apache.camel.spi.EventNotifier} which sends alters to Nagios. Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java (original) +++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConsumerTest.java Tue Aug 23 13:27:43 2011 @@ -20,14 +20,13 @@ import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; -import org.apache.camel.impl.ServiceSupport; +import org.apache.camel.support.ServiceSupport; import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; import org.mockito.Mockito; - import quickfix.FixVersions; import quickfix.Message; import quickfix.MessageUtils; Modified: camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxServiceSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxServiceSupport.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxServiceSupport.java (original) +++ camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxServiceSupport.java Tue Aug 23 13:27:43 2011 @@ -22,8 +22,8 @@ import java.util.concurrent.ExecutorServ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.LoggingExceptionHandler; -import org.apache.camel.impl.ServiceSupport; import org.apache.camel.spi.ExceptionHandler; +import org.apache.camel.support.ServiceSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringManagementMBeanAssembler.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringManagementMBeanAssembler.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringManagementMBeanAssembler.java (original) +++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringManagementMBeanAssembler.java Tue Aug 23 13:27:43 2011 @@ -25,7 +25,7 @@ import javax.management.modelmbean.Model import javax.management.modelmbean.RequiredModelMBean; import org.apache.camel.management.DefaultManagementMBeanAssembler; -import org.apache.camel.management.mbean.ManagedInstance; +import org.apache.camel.spi.management.ManagedInstance; import org.apache.camel.util.ObjectHelper; import org.springframework.jmx.export.annotation.AnnotationJmxAttributeSource; import org.springframework.jmx.export.annotation.ManagedResource; Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java (original) +++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/StartAndStopEventNotifier.java Tue Aug 23 13:27:43 2011 @@ -21,9 +21,9 @@ import java.util.EventObject; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.ProducerTemplate; -import org.apache.camel.management.EventNotifierSupport; import org.apache.camel.management.event.CamelContextStartedEvent; import org.apache.camel.management.event.CamelContextStoppingEvent; +import org.apache.camel.support.EventNotifierSupport; /** * Event notifier which is executed just after Camel has been started, Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java (original) +++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java Tue Aug 23 13:27:43 2011 @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.EventObject; import java.util.List; -import org.apache.camel.management.EventNotifierSupport; +import org.apache.camel.support.EventNotifierSupport; /** * @version Modified: camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepository.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepository.java?rev=1160679&r1=1160678&r2=1160679&view=diff ============================================================================== --- camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepository.java (original) +++ camel/trunk/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/JdbcMessageIdRepository.java Tue Aug 23 13:27:43 2011 @@ -17,13 +17,14 @@ package org.apache.camel.processor.idempotent.jdbc; import java.sql.Timestamp; + import javax.sql.DataSource; -import org.apache.camel.impl.ServiceSupport; -import org.apache.camel.management.ManagedAttribute; -import org.apache.camel.management.ManagedOperation; -import org.apache.camel.management.ManagedResource; import org.apache.camel.spi.IdempotentRepository; +import org.apache.camel.spi.management.ManagedAttribute; +import org.apache.camel.spi.management.ManagedOperation; +import org.apache.camel.spi.management.ManagedResource; +import org.apache.camel.support.ServiceSupport; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.TransactionDefinition;
