[jboss-svn-commits] JBL Code SVN: r23475 - in labs/jbossesb/workspace/skeagh: api/service and 70 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Oct 16 09:23:20 EDT 2008


Author: tfennelly
Date: 2008-10-16 09:23:19 -0400 (Thu, 16 Oct 2008)
New Revision: 23475

Added:
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/AnnotationConstants.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Initialize.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Properties.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Property.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Uninitialize.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/AddressingContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/DeploymentContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ESBContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/FaultContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/InvocationContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ResourceLocator.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/JBossESBException.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/Message.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessingException.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessor.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/doc-files/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/FilterEvaluator.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/InboundRouter.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/MessageDispatcher.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/OutboundRouter.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/RoutingException.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/Service.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceException.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceMEP.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceName.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/test/java/org/jboss/esb/api/
   labs/jbossesb/workspace/skeagh/api/service/src/test/java/org/jboss/esb/api/service/
   labs/jbossesb/workspace/skeagh/api/service/src/test/java/org/jboss/esb/api/service/ServiceNameTest.java
Removed:
   labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/FilterEvaluator.java
   labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/InboundRouter.java
   labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/MessageDispatcher.java
   labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/OutboundRouter.java
   labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/RoutingException.java
   labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/AnnotationConstants.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Initialize.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Properties.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Property.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Uninitialize.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/AddressingContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/DeploymentContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ESBContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/FaultContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/InvocationContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ResourceLocator.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/JBossESBException.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/Message.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessingException.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessor.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/doc-files/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/Service.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceException.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceMEP.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceName.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/exception/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/package.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/
   labs/jbossesb/workspace/skeagh/api/service/src/test/java/org/jboss/esb/service/
Modified:
   labs/jbossesb/workspace/skeagh/api/service/osgi.bnd
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/doc-files/4.x-to-5.x-devnotes.html
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/overview.html
   labs/jbossesb/workspace/skeagh/container/osgi/api/osgi.bnd
   labs/jbossesb/workspace/skeagh/container/osgi/runtime/osgi.bnd
   labs/jbossesb/workspace/skeagh/container/osgi/runtime/src/main/java/org/jboss/esb/osgi/BundleResourceLocator.java
   labs/jbossesb/workspace/skeagh/examples/helloworld/osgi.bnd
   labs/jbossesb/workspace/skeagh/examples/helloworld/src/main/java/org/jboss/esb/examples/helloworld/MyTestService.java
   labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInboundRouter.java
   labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInformationExtractor.java
   labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInformationExtractorTest.java
   labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/MyTestService.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DefaultResourceLocator.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentException.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentUtil.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ConfigUtil.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/DeploymentUnit.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/FilterConfig.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterFilterConfig.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/PropertiesUtil.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ServiceConfig.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/CreateObject.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/FilterDecisionTreeBuilder.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/SetProperty.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/AbstractDispatcher.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/DispatchChain.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/failure/DeadLetterPersistanceService.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/failure/MockDeadLetterService.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentMonitor.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentServiceSets.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/Bus.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusDispatcher.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusInboundRouter.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusMessage.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusMessageListener.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusOutboundRouter.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusRoutingContext.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/filter/FilterDecisionNode.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/filter/MVELEvaluator.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/ProcessingEvent.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/ProcessingEventLog.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/events/BusRouterProcessingEvent.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/events/ServiceProcessingEvent.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/invoke/ServiceInvoker.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/invoke/ServiceRouter.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/AbstractScheduleListener.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/CronSchedule.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/JobScheduler.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/Schedule.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SchedulingException.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SimpleSchedule.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/SerializationException.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/Serializer.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/java/JavaSerializer.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JBossESBTestCase.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/util/XsdDOMValidator.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/inrouters-smooks.xml
   labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/outrouters-smooks.xml
   labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/processors-smooks.xml
   labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/servicename-smooks.xml
   labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/services-smooks.xml
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/ESBTestComponent.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestInboundRouter.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestOutboundRouter.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestService.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestTransformer.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedResource.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedTestPropertiesResource.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedTestPropertiesResource2.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/InboundFilterConfigTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyInRouter.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyMessageTransformer.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyOutRouter.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyResource.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyTestService.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/OutboundFilterConfigTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/XProtDeploymentResource.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/digest/ConfigUtilTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/UndeployDispatcherDelayTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloInboundRouter.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloOutboundRouter.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloWorldService.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/LocalDispatcherTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/RestStringTransformer.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/DeploymentServiceSetsTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_015/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_016/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_017/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_018/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_019/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_020/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_021/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_022/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_023/RoutingTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/MockScheduledInboundRouter.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/ScheduleListenerTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/serialization/java/JavaSerializerTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/util/XsdDOMValidatorTest.java
Log:
merged the service and routing apis into the service API... will just have a single api module

Deleted: labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/FilterEvaluator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/FilterEvaluator.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/FilterEvaluator.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.routing;
-
-import org.jboss.esb.message.Message;
-
-/**
- * Routing filter evaluator.
- * <p/>
- * Filters can be applied to inbound and outbound routers.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public interface FilterEvaluator
-{
-    /**
-     * Filter the message.
-     *
-     * @param message The message to be evaluated.
-     * @return True if the message is to be filtered through.  False if the message is to be filtered out.
-     */
-    boolean filterMessage(Message message);
-}

Deleted: labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/InboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/InboundRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/InboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.routing;
-
-/**
- * Inbound Router.
- * <h3>Deployment Context</h3>
- * An instance can have its associated {@link org.jboss.esb.context.DeploymentContext}
- * set by simply defining a property by the name "deploymentContext" e.g.
- * <pre>
- * public MyRouter implements InboundRouter {
- *      {@link org.jboss.esb.context.DeploymentContext} deploymentContext;
- * }
- * </pre>
- * The framework will inject the value.
- * <h3>Service Name</h3>
- * An instance can have its associated {@link org.jboss.esb.service.ServiceName}
- * set by simply defining a property by the name "serviceName" e.g.
- * <pre>
- * public MyRouter implements InboundRouter {
- *      {@link org.jboss.esb.service.ServiceName} serviceName;
- * }
- * </pre>
- * The framework will inject the value.
- * <h3>Configuration Name</h3>
- * An instance can have its associated configuration name (name, id etc from the configuration)
- * set by simply defining a property by the name "objectName" e.g.
- * <pre>
- * public MyRouter implements InboundRouter {
- *      String objectName;
- * }
- * </pre>
- * The framework will inject the value.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public interface InboundRouter
-{
-    // TODO: Add support for filtering inbound messages, allowing sharing/reuse of inbound endpoints across 1+ services
-
-    /**
-     * Set the {@link MessageDispatcher} for the router.
-     * <p/>
-     * Implementations use the dispatcher to dispatch messages to the
-     * consuming Service.  The ESB runtime handles the details of delivering the
-     * message to the interested Service.
-     *
-     * @param dispatcher The {@link MessageDispatcher} instance.
-     */
-    void setDispatcher(MessageDispatcher dispatcher);
-}

Deleted: labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/MessageDispatcher.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/MessageDispatcher.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/MessageDispatcher.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.routing;
-
-import org.jboss.esb.context.InvocationContext;
-import org.jboss.esb.message.Message;
-
-/**
- * Message Dispatcher.
- * <p/>
- * An implementation of this class is injected into every {@link InboundRouter}
- * instance, which uses it to dispatch the Messages it is receiving to the
- * target Service that is interested in them.  Basically, it's a mechanism
- * for allowing the router to forward the Message to the core ESB runtime for
- * dispatch to the target Service.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public interface MessageDispatcher
-{
-    /**
-     * Dispatch the message to the target service.
-     *
-     * @param message           The message to be dispatched.
-     * @param invocationContext The InvocationContext for the message dispatch.
-     */
-    void dispatch(Message message, InvocationContext invocationContext);
-
-    /**
-     * Is the dispatcher instance processing messages.
-     * <p/>
-     * This is required by the undeploy process.  After uninitializing
-     * all {@link InboundRouter} instances, the undeploy waits untill
-     * all dispatchers have completed processing all their messages before
-     * continuing with the undeploy (uninitializing all other components
-     * and resources).
-     *
-     * @return True if the dispatcher has active messages that it is
-     *         processing, otherwise false.
-     */
-    boolean isProcessingMessages();
-}

Deleted: labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/OutboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/OutboundRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/OutboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.routing;
-
-import org.jboss.esb.message.Message;
-
-/**
- * Outbound Router.
- * <h3>Deployment Context</h3>
- * An instance can have its associated {@link org.jboss.esb.context.DeploymentContext}
- * set by simply defining a property by the name "deploymentContext" e.g.
- * <pre>
- * public MyRouter implements OutboundRouter {
- *      {@link org.jboss.esb.context.DeploymentContext} deploymentContext;
- * }
- * </pre>
- * The framework will inject the value.
- * <h3>Service Name</h3>
- * An instance can have its associated {@link org.jboss.esb.service.ServiceName}
- * set by simply defining a property by the name "serviceName" e.g.
- * <pre>
- * public MyRouter implements OutboundRouter {
- *      {@link org.jboss.esb.service.ServiceName} serviceName;
- * }
- * </pre>
- * The framework will inject the value.
- * <h3>Configuration Name</h3>
- * An instance can have its associated configuration name (name, id etc from the configuration)
- * set by simply defining a property by the name "objectName" e.g.
- * <pre>
- * public MyRouter implements OutboundRouter {
- *      String objectName;
- * }
- * </pre>
- * The framework will inject the value.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public interface OutboundRouter
-{
-    // TODO: Add support for filtering outbound messages.  Content based routing??
-
-    /**
-     * Route the message.
-     *
-     * @param message The message to be routed.
-     * @throws RoutingException An exception occured while routing the message.
-     */
-    void route(Message message) throws RoutingException;
-}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/RoutingException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/RoutingException.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/RoutingException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.routing;
-
-import org.jboss.esb.exception.JBossESBException;
-
-/**
- * Routing exception.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class RoutingException extends JBossESBException
-{
-    /**
-     * Public Constructor.
-     *
-     * @param message Exception message.
-     */
-    public RoutingException(final String message)
-    {
-        super(message);
-    }
-
-    /**
-     * Public Constructor.
-     *
-     * @param message Exception message.
-     * @param cause   Exception cause.
-     */
-    public RoutingException(final String message, final Throwable cause)
-    {
-        super(message, cause);
-    }
-}

Deleted: labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/package.html
===================================================================
--- labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/package.html	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,8 +0,0 @@
-<html>
-<head></head>
-<body>
-ESB Message Routing.
-
-<h2>Package Specification</h2>
-</body>
-</html>
\ No newline at end of file

Modified: labs/jbossesb/workspace/skeagh/api/service/osgi.bnd
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/osgi.bnd	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/api/service/osgi.bnd	2008-10-16 13:23:19 UTC (rev 23475)
@@ -2,8 +2,8 @@
 # Use this file to add customized Bnd instructions for the bundle
 #-----------------------------------------------------------------
 
-Export-Package: org.jboss.esb.annotations.*, \
-org.jboss.esb.context.*, \
-org.jboss.esb.message.*, \
-org.jboss.esb.exception.*, \
-org.jboss.esb.service.*
+Export-Package: org.jboss.esb.api.annotations.*, \
+org.jboss.esb.api.context.*, \
+org.jboss.esb.api.message.*, \
+org.jboss.esb.api.exception.*, \
+org.jboss.esb.api.service.*

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations (from rev 23464, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations)

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/AnnotationConstants.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/AnnotationConstants.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/AnnotationConstants.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,27 +0,0 @@
-package org.jboss.esb.annotations;
-
-/**
-* Annotation constants.
-*
-* @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
-*/
-public final class AnnotationConstants
-{
-    /**
-     * Private constructor to prevent instanitiation.
-     */
-    private AnnotationConstants()
-    {
-        throw new AssertionError("Should not be able to call this private constructor.");
-    }
-
-   /**
-    * "null" default annotation value.
-    */
-   public static final String NULL_STRING = "##NULL";
-
-   /**
-    * Unassigned default.
-    */
-   public static final String UNASSIGNED = "org.jboss.esb.annotation.AnnotationConstants##UNASSIGNED";
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/AnnotationConstants.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/AnnotationConstants.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/AnnotationConstants.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/AnnotationConstants.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,27 @@
+package org.jboss.esb.api.annotations;
+
+/**
+* Annotation constants.
+*
+* @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+*/
+public final class AnnotationConstants
+{
+    /**
+     * Private constructor to prevent instanitiation.
+     */
+    private AnnotationConstants()
+    {
+        throw new AssertionError("Should not be able to call this private constructor.");
+    }
+
+   /**
+    * "null" default annotation value.
+    */
+   public static final String NULL_STRING = "##NULL";
+
+   /**
+    * Unassigned default.
+    */
+   public static final String UNASSIGNED = "org.jboss.esb.annotation.AnnotationConstants##UNASSIGNED";
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Initialize.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/Initialize.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Initialize.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * Initialization method annotation.
- * <p/>
- * Can be used by any ESB component ({@link org.jboss.esb.service.Service} etc)
- * to flag that component as requiring deployment-time initialization via that method (zero-arg).
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
- at Documented
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ ElementType.METHOD })
-public @interface Initialize
-{
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Initialize.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/Initialize.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Initialize.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Initialize.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Initialization method annotation.
+ * <p/>
+ * Can be used by any ESB component ({@link org.jboss.esb.api.service.Service} etc)
+ * to flag that component as requiring deployment-time initialization via that method (zero-arg).
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+ at Documented
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ ElementType.METHOD })
+public @interface Initialize
+{
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Properties.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/Properties.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Properties.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
- * LLC, and individual contributors by the @authors tag. See the copyright.txt
- * in the distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this software; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- * site: http://www.fsf.org.
- */
-package org.jboss.esb.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Configuration paramater field annotation.
- * <p/>
- * This annotation can be uses to cause all properties that
- * exist in a configuration to be added to a specified Properties instance.
- * Any field in a class that does not have a {@link Property} annotation
- * specified will be added to the Properties instance.
- *
- * <h3>Usage</h3>
- * <pre>{@code
- *     @Properties
- *     private String properties;
- * </pre>}
- *
- *@author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
- */
- at Documented
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ ElementType.FIELD })
-public @interface Properties
-{
-    /**
-     * Paramater required or optional. <p/> Defaults to required.
-     */
-    Use use() default Use.REQUIRED;
-
-    /**
-     * Configuration paramater use.
-     */
-    public static enum Use
-    {
-        /**
-         * Parameter is required.
-         */
-        REQUIRED,
-
-        /**
-         * Parameter is optional.
-         */
-        OPTIONAL,
-    }
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Properties.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/Properties.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Properties.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Properties.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.esb.api.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Configuration paramater field annotation.
+ * <p/>
+ * This annotation can be uses to cause all properties that
+ * exist in a configuration to be added to a specified Properties instance.
+ * Any field in a class that does not have a {@link Property} annotation
+ * specified will be added to the Properties instance.
+ *
+ * <h3>Usage</h3>
+ * <pre>{@code
+ *     @Properties
+ *     private String properties;
+ * </pre>}
+ *
+ *@author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+ at Documented
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ ElementType.FIELD })
+public @interface Properties
+{
+    /**
+     * Paramater required or optional. <p/> Defaults to required.
+     */
+    Use use() default Use.REQUIRED;
+
+    /**
+     * Configuration paramater use.
+     */
+    public static enum Use
+    {
+        /**
+         * Parameter is required.
+         */
+        REQUIRED,
+
+        /**
+         * Parameter is optional.
+         */
+        OPTIONAL,
+    }
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Property.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/Property.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Property.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,117 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
- * LLC, and individual contributors by the @authors tag. See the copyright.txt
- * in the distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this software; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- * site: http://www.fsf.org.
- */
-package org.jboss.esb.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Configuration paramater field annotation.
- * <p/>
- * <p/>
- * <h3>Usage</h3>
- * Where the paramater name is the same as the field name:
- * <pre>{@code
- *     @Property
- *     private int maxDigits;
- * </pre>}
- * Where the paramater name is NOT the same as the field name:
- * <pre>{@code
- *     @Property(name="max-digits")
- *     private int maxDigits;
- * </pre>}
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
- at Documented
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ ElementType.FIELD })
-public @interface Property
-{
-
-    /**
-     * The paramater name as defined in the resource configuration. If not
-     * defined, the name defaults to the name of the field.
-     */
-    String name() default AnnotationConstants.NULL_STRING;
-
-    /**
-     * Paramater required or optional. <p/> Defaults to required.
-     */
-    Use use() default Use.REQUIRED;
-
-    /**
-     * The default paramater value.
-     */
-    String defaultVal() default AnnotationConstants.UNASSIGNED;
-
-    /**
-     * Paramater choice values.
-     */
-    String[] choice() default AnnotationConstants.NULL_STRING;
-
-    /**
-     * Configuration paramater use.
-     */
-    public static enum Use
-    {
-        /**
-         * Parameter is required.
-         */
-        REQUIRED,
-
-        /**
-         * Parameter is optional.
-         */
-        OPTIONAL,
-    }
-
-    /**
-     * Property annotation assertions.
-     */
-    public final class Assert
-    {
-        /**
-         * Private constructor.
-         */
-        private Assert()
-        {
-        }
-
-        /**
-         * Is the default value set on the annotation.
-         *
-         * @param annotation The annotation.
-         * @return True if the defaultVal is assigned a value, otherwise false.
-         */
-        public static boolean isDefaultAssigned(final Property annotation)
-        {
-            if (AnnotationConstants.UNASSIGNED.equals(annotation.defaultVal()))
-            {
-                return false;
-            }
-            return true;
-        }
-    }
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Property.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/Property.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Property.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Property.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.esb.api.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Configuration paramater field annotation.
+ * <p/>
+ * <p/>
+ * <h3>Usage</h3>
+ * Where the paramater name is the same as the field name:
+ * <pre>{@code
+ *     @Property
+ *     private int maxDigits;
+ * </pre>}
+ * Where the paramater name is NOT the same as the field name:
+ * <pre>{@code
+ *     @Property(name="max-digits")
+ *     private int maxDigits;
+ * </pre>}
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+ at Documented
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ ElementType.FIELD })
+public @interface Property
+{
+
+    /**
+     * The paramater name as defined in the resource configuration. If not
+     * defined, the name defaults to the name of the field.
+     */
+    String name() default AnnotationConstants.NULL_STRING;
+
+    /**
+     * Paramater required or optional. <p/> Defaults to required.
+     */
+    Use use() default Use.REQUIRED;
+
+    /**
+     * The default paramater value.
+     */
+    String defaultVal() default AnnotationConstants.UNASSIGNED;
+
+    /**
+     * Paramater choice values.
+     */
+    String[] choice() default AnnotationConstants.NULL_STRING;
+
+    /**
+     * Configuration paramater use.
+     */
+    public static enum Use
+    {
+        /**
+         * Parameter is required.
+         */
+        REQUIRED,
+
+        /**
+         * Parameter is optional.
+         */
+        OPTIONAL,
+    }
+
+    /**
+     * Property annotation assertions.
+     */
+    public final class Assert
+    {
+        /**
+         * Private constructor.
+         */
+        private Assert()
+        {
+        }
+
+        /**
+         * Is the default value set on the annotation.
+         *
+         * @param annotation The annotation.
+         * @return True if the defaultVal is assigned a value, otherwise false.
+         */
+        public static boolean isDefaultAssigned(final Property annotation)
+        {
+            if (AnnotationConstants.UNASSIGNED.equals(annotation.defaultVal()))
+            {
+                return false;
+            }
+            return true;
+        }
+    }
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Uninitialize.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/Uninitialize.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Uninitialize.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * Uninitialization method annotation.
- * <p/>
- * Can be used by any ESB component ({@link org.jboss.esb.service.Service} etc)
- * to flag that component as requiring undeployment-time uninitialization via that method (zero-arg).
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
- at Documented
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ ElementType.METHOD })
-public @interface Uninitialize
-{
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Uninitialize.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/Uninitialize.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Uninitialize.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/Uninitialize.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Uninitialization method annotation.
+ * <p/>
+ * Can be used by any ESB component ({@link org.jboss.esb.api.service.Service} etc)
+ * to flag that component as requiring undeployment-time uninitialization via that method (zero-arg).
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+ at Documented
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ ElementType.METHOD })
+public @interface Uninitialize
+{
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/package.html
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/package.html	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,8 +0,0 @@
-<html>
-<head></head>
-<body>
-Configuration Annotations.
-
-<h2>Package Specification</h2>
-</body>
-</html>

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/package.html (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/annotations/package.html)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/package.html	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/annotations/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+Configuration Annotations.
+
+<h2>Package Specification</h2>
+</body>
+</html>

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context (from rev 23464, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context)

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/AddressingContext.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/AddressingContext.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/AddressingContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,164 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.context;
-
-import org.jboss.esb.service.ServiceName;
-
-import java.io.Serializable;
-
-/**
- * Message Addressing Context.
- *
- * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
- */
-public class AddressingContext implements Serializable
-{
-    /**
-     * "To" ServiceName for the message associated with the current context.
-     */
-    private ServiceName to;
-    /**
-     * "From" ServiceName for the message associated with the current context.
-     */
-    private ServiceName from;
-    /**
-     * "ReplyTo" ServiceName for the message associated with the current context.
-     */
-    private ServiceName replyTo;
-    /**
-     * "FaultTo" ServiceName for the message associated with the current context.
-     */
-    private ServiceName faultTo;
-    /**
-     * Context ThreadLocal.
-     */
-    private static ThreadLocal<AddressingContext> contextTL = new ThreadLocal<AddressingContext>();
-
-    /**
-     * Set the {@link AddressingContext} associated with the current thread.
-     *
-     * @param context The {@link AddressingContext} associated with the current thread.
-     */
-    public static void setContext(final AddressingContext context)
-    {
-        if (context != null)
-        {
-            contextTL.set(context);
-        } else
-        {
-            contextTL.remove();
-        }
-    }
-
-    /**
-     * Get the {@link AddressingContext} associated with the message currently
-     * being processed.
-     *
-     * @return The {@link AddressingContext} associated with the message currently
-     *         being processed.
-     */
-    public static AddressingContext getContext()
-    {
-        return contextTL.get();
-    }
-
-    /**
-     * Get the "To" address.
-     *
-     * @return The "To" address.
-     */
-    public final ServiceName getTo()
-    {
-        return to;
-    }
-
-    /**
-     * Set the "To" address.
-     *
-     * @param to The "To" address.
-     */
-    public final void setTo(final ServiceName to)
-    {
-        this.to = to;
-    }
-
-    /**
-     * Get the "From" address.
-     *
-     * @return The "From" address.
-     */
-    public final ServiceName getFrom()
-    {
-        return from;
-    }
-
-    /**
-     * Set the "To" address.
-     *
-     * @param from The "To" address.
-     */
-    public final void setFrom(final ServiceName from)
-    {
-        this.from = from;
-    }
-
-    /**
-     * Get the "ReplyTo" address.
-     *
-     * @return The "ReplyTo" address.
-     */
-    public final ServiceName getReplyTo()
-    {
-        return replyTo;
-    }
-
-    /**
-     * Set the "ReplyTo" address.
-     *
-     * @param replyTo The "ReplyTo" address.
-     */
-    public final void setReplyTo(final ServiceName replyTo)
-    {
-        this.replyTo = replyTo;
-    }
-
-    /**
-     * Get the "FaultTo" address.
-     *
-     * @return The "FaultTo" address.
-     */
-    public final ServiceName getFaultTo()
-    {
-        return faultTo;
-    }
-
-    /**
-     * Set the "FaultTo" address.
-     *
-     * @param faultTo The "FaultTo" address.
-     */
-    public final void setFaultTo(final ServiceName faultTo)
-    {
-        this.faultTo = faultTo;
-    }
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/AddressingContext.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/AddressingContext.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/AddressingContext.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/AddressingContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.context;
+
+import org.jboss.esb.api.service.ServiceName;
+
+import java.io.Serializable;
+
+/**
+ * Message Addressing Context.
+ *
+ * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
+ */
+public class AddressingContext implements Serializable
+{
+    /**
+     * "To" ServiceName for the message associated with the current context.
+     */
+    private ServiceName to;
+    /**
+     * "From" ServiceName for the message associated with the current context.
+     */
+    private ServiceName from;
+    /**
+     * "ReplyTo" ServiceName for the message associated with the current context.
+     */
+    private ServiceName replyTo;
+    /**
+     * "FaultTo" ServiceName for the message associated with the current context.
+     */
+    private ServiceName faultTo;
+    /**
+     * Context ThreadLocal.
+     */
+    private static ThreadLocal<AddressingContext> contextTL = new ThreadLocal<AddressingContext>();
+
+    /**
+     * Set the {@link AddressingContext} associated with the current thread.
+     *
+     * @param context The {@link AddressingContext} associated with the current thread.
+     */
+    public static void setContext(final AddressingContext context)
+    {
+        if (context != null)
+        {
+            contextTL.set(context);
+        } else
+        {
+            contextTL.remove();
+        }
+    }
+
+    /**
+     * Get the {@link AddressingContext} associated with the message currently
+     * being processed.
+     *
+     * @return The {@link AddressingContext} associated with the message currently
+     *         being processed.
+     */
+    public static AddressingContext getContext()
+    {
+        return contextTL.get();
+    }
+
+    /**
+     * Get the "To" address.
+     *
+     * @return The "To" address.
+     */
+    public final ServiceName getTo()
+    {
+        return to;
+    }
+
+    /**
+     * Set the "To" address.
+     *
+     * @param to The "To" address.
+     */
+    public final void setTo(final ServiceName to)
+    {
+        this.to = to;
+    }
+
+    /**
+     * Get the "From" address.
+     *
+     * @return The "From" address.
+     */
+    public final ServiceName getFrom()
+    {
+        return from;
+    }
+
+    /**
+     * Set the "To" address.
+     *
+     * @param from The "To" address.
+     */
+    public final void setFrom(final ServiceName from)
+    {
+        this.from = from;
+    }
+
+    /**
+     * Get the "ReplyTo" address.
+     *
+     * @return The "ReplyTo" address.
+     */
+    public final ServiceName getReplyTo()
+    {
+        return replyTo;
+    }
+
+    /**
+     * Set the "ReplyTo" address.
+     *
+     * @param replyTo The "ReplyTo" address.
+     */
+    public final void setReplyTo(final ServiceName replyTo)
+    {
+        this.replyTo = replyTo;
+    }
+
+    /**
+     * Get the "FaultTo" address.
+     *
+     * @return The "FaultTo" address.
+     */
+    public final ServiceName getFaultTo()
+    {
+        return faultTo;
+    }
+
+    /**
+     * Set the "FaultTo" address.
+     *
+     * @param faultTo The "FaultTo" address.
+     */
+    public final void setFaultTo(final ServiceName faultTo)
+    {
+        this.faultTo = faultTo;
+    }
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/DeploymentContext.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/DeploymentContext.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/DeploymentContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,133 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.context;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Deployment Context.
- * <p/>
- * Mutable context scoped around a deployment runtime instance .
- * <p/>
- * Deployment resources are handled explicitly because we need to manage
- * their lifecycle.
- *
- * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
- */
-public class DeploymentContext implements ESBContext
-{
-    /**
-     * List of deployment resource objects.
-     * <p/>
-     * Deployment resources are handled explicitly and are immutable.
-     */
-    private Map<String, Object> resources = new LinkedHashMap<String, Object>();
-    /**
-     * Context Data Map.
-     */
-    private Map<Object, Object> contextMap = new LinkedHashMap<Object, Object>();
-    /**
-     * Context ThreadLocal.
-     */
-    private static ThreadLocal<DeploymentContext> contextTL = new ThreadLocal<DeploymentContext>();
-
-    /**
-     * Set the {@link DeploymentContext} associated with the current thread.
-     *
-     * @param context The {@link DeploymentContext} associated with the current thread.
-     */
-    public static void setContext(final DeploymentContext context)
-    {
-        if (context != null)
-        {
-            contextTL.set(context);
-        } else
-        {
-            contextTL.remove();
-        }
-    }
-
-    /**
-     * Get the {@link DeploymentContext} associated with the current thread.
-     *
-     * @return The {@link DeploymentContext} associated with the current thread.
-     */
-    public static DeploymentContext getContext()
-    {
-        return contextTL.get();
-    }
-
-    /**
-     * Set the list of deployment resources on the context.
-     *
-     * @param resources A list of deployment resources associated with this deployment.
-     */
-    public final void setResources(final Map<String, Object> resources)
-    {
-        this.resources = resources;
-    }
-
-    /**
-     * Get the deployment resource Object from the context using the supplied id.
-     *
-     * @param id The resource ID.
-     * @return The resource object, otherwise null.
-     */
-    public final Object getResource(final String id)
-    {
-        return resources.get(id);
-    }
-
-    /**
-     * Get the Object from the context using the supplied key.
-     *
-     * @param key The context key.
-     * @return The Object bound under the supplied context key, otherwise null.
-     */
-    public final Object getContextObject(final Object key)
-    {
-        return contextMap.get(key);
-    }
-
-    /**
-     * Set the value Object into the context using the supplied key.
-     *
-     * @param key   The context key.
-     * @param value The value object to be set in the context.
-     */
-    public final void setContextObject(final Object key, final Object value)
-    {
-        contextMap.put(key, value);
-    }
-
-    /**
-     * Get the context Map.
-     *
-     * @return The context Map.
-     */
-    public final Map<Object, Object> getAll()
-    {
-        return contextMap;
-    }
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/DeploymentContext.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/DeploymentContext.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/DeploymentContext.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/DeploymentContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,133 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.context;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Deployment Context.
+ * <p/>
+ * Mutable context scoped around a deployment runtime instance .
+ * <p/>
+ * Deployment resources are handled explicitly because we need to manage
+ * their lifecycle.
+ *
+ * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
+ */
+public class DeploymentContext implements ESBContext
+{
+    /**
+     * List of deployment resource objects.
+     * <p/>
+     * Deployment resources are handled explicitly and are immutable.
+     */
+    private Map<String, Object> resources = new LinkedHashMap<String, Object>();
+    /**
+     * Context Data Map.
+     */
+    private Map<Object, Object> contextMap = new LinkedHashMap<Object, Object>();
+    /**
+     * Context ThreadLocal.
+     */
+    private static ThreadLocal<DeploymentContext> contextTL = new ThreadLocal<DeploymentContext>();
+
+    /**
+     * Set the {@link DeploymentContext} associated with the current thread.
+     *
+     * @param context The {@link DeploymentContext} associated with the current thread.
+     */
+    public static void setContext(final DeploymentContext context)
+    {
+        if (context != null)
+        {
+            contextTL.set(context);
+        } else
+        {
+            contextTL.remove();
+        }
+    }
+
+    /**
+     * Get the {@link DeploymentContext} associated with the current thread.
+     *
+     * @return The {@link DeploymentContext} associated with the current thread.
+     */
+    public static DeploymentContext getContext()
+    {
+        return contextTL.get();
+    }
+
+    /**
+     * Set the list of deployment resources on the context.
+     *
+     * @param resources A list of deployment resources associated with this deployment.
+     */
+    public final void setResources(final Map<String, Object> resources)
+    {
+        this.resources = resources;
+    }
+
+    /**
+     * Get the deployment resource Object from the context using the supplied id.
+     *
+     * @param id The resource ID.
+     * @return The resource object, otherwise null.
+     */
+    public final Object getResource(final String id)
+    {
+        return resources.get(id);
+    }
+
+    /**
+     * Get the Object from the context using the supplied key.
+     *
+     * @param key The context key.
+     * @return The Object bound under the supplied context key, otherwise null.
+     */
+    public final Object getContextObject(final Object key)
+    {
+        return contextMap.get(key);
+    }
+
+    /**
+     * Set the value Object into the context using the supplied key.
+     *
+     * @param key   The context key.
+     * @param value The value object to be set in the context.
+     */
+    public final void setContextObject(final Object key, final Object value)
+    {
+        contextMap.put(key, value);
+    }
+
+    /**
+     * Get the context Map.
+     *
+     * @return The context Map.
+     */
+    public final Map<Object, Object> getAll()
+    {
+        return contextMap;
+    }
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ESBContext.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/ESBContext.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ESBContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.context;
-
-import java.util.Map;
-
-/**
- * ESB Context.
- *
- * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
- */
-public interface ESBContext
-{
-
-    /**
-     * Get an object from the context.
-     *
-     * @param key The context object key.
-     * @return The Object instance, or null if the Object is not bound to the
-     *         context instance.
-     */
-    Object getContextObject(final Object key);
-
-    /**
-     * Set an object on the context.
-     *
-     * @param key   The context object key.
-     * @param value The object instance.
-     */
-    void setContextObject(final Object key, final Object value);
-
-    /**
-     * Get all the context objects.
-     *
-     * @return The context Map.
-     */
-    Map<Object, Object> getAll();
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ESBContext.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/ESBContext.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ESBContext.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ESBContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.context;
+
+import java.util.Map;
+
+/**
+ * ESB Context.
+ *
+ * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
+ */
+public interface ESBContext
+{
+
+    /**
+     * Get an object from the context.
+     *
+     * @param key The context object key.
+     * @return The Object instance, or null if the Object is not bound to the
+     *         context instance.
+     */
+    Object getContextObject(final Object key);
+
+    /**
+     * Set an object on the context.
+     *
+     * @param key   The context object key.
+     * @param value The object instance.
+     */
+    void setContextObject(final Object key, final Object value);
+
+    /**
+     * Get all the context objects.
+     *
+     * @return The context Map.
+     */
+    Map<Object, Object> getAll();
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/FaultContext.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/FaultContext.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/FaultContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,124 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.context;
-
-import org.jboss.esb.message.Message;
-import org.jboss.esb.service.ServiceName;
-
-import java.io.Serializable;
-
-/**
- * Fault Context.
- * <p/>
- * Stores fault context data.  Check for the existance of a fault by calling
- * {@link #getFault()}.  This method will return any fault, or
- * null if no fault occured.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
- */
-public class FaultContext implements Serializable
-{
-    /**
-     * The fault.
-     */
-    private Throwable fault;
-    /**
-     * The fault recipient.
-     */
-    private ServiceName faultRecipient;
-    /**
-     * The fault message.
-     */
-    private Message faultMessage;
-
-    /**
-     * Get the fault.
-     *
-     * @return The fault, or null if no fault has occured.
-     */
-    public final Throwable getFault()
-    {
-        return fault;
-    }
-
-    /**
-     * Set the fault.
-     *
-     * @param fault The fault.
-     */
-    public final void setFault(final Throwable fault)
-    {
-        if (this.fault == null)
-        {
-            this.fault = fault;
-        }
-    }
-
-    /**
-     * Get the fault recipient.
-     * <p/>
-     * This is the name of the service to which the fault was routed.
-     *
-     * @return The fault recipient.
-     */
-    public final ServiceName getFaultRecipient()
-    {
-        return faultRecipient;
-    }
-
-    /**
-     * Set the fault recipient.
-     * <p/>
-     * This is the name of the service to which the fault was routed.
-     *
-     * @param faultRecipient The fault recipient.
-     */
-    public final void setFaultRecipient(final ServiceName faultRecipient)
-    {
-        this.faultRecipient = faultRecipient;
-    }
-
-    /**
-     * Get the fault message.
-     * <p/>
-     * The message at the point in time when the fault occured.
-     *
-     * @return The fault message.
-     */
-    public final Message getFaultMessage()
-    {
-        return faultMessage;
-    }
-
-    /**
-     * Set the fault message.
-     * <p/>
-     * The message at the point in time when the fault occured.
-     *
-     * @param faultMessage The fault message.
-     */
-    public final void setFaultMessage(final Message faultMessage)
-    {
-        if (this.faultMessage == null)
-        {
-            this.faultMessage = faultMessage;
-        }
-    }
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/FaultContext.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/FaultContext.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/FaultContext.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/FaultContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,124 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.context;
+
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.service.ServiceName;
+
+import java.io.Serializable;
+
+/**
+ * Fault Context.
+ * <p/>
+ * Stores fault context data.  Check for the existance of a fault by calling
+ * {@link #getFault()}.  This method will return any fault, or
+ * null if no fault occured.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
+ */
+public class FaultContext implements Serializable
+{
+    /**
+     * The fault.
+     */
+    private Throwable fault;
+    /**
+     * The fault recipient.
+     */
+    private ServiceName faultRecipient;
+    /**
+     * The fault message.
+     */
+    private Message faultMessage;
+
+    /**
+     * Get the fault.
+     *
+     * @return The fault, or null if no fault has occured.
+     */
+    public final Throwable getFault()
+    {
+        return fault;
+    }
+
+    /**
+     * Set the fault.
+     *
+     * @param fault The fault.
+     */
+    public final void setFault(final Throwable fault)
+    {
+        if (this.fault == null)
+        {
+            this.fault = fault;
+        }
+    }
+
+    /**
+     * Get the fault recipient.
+     * <p/>
+     * This is the name of the service to which the fault was routed.
+     *
+     * @return The fault recipient.
+     */
+    public final ServiceName getFaultRecipient()
+    {
+        return faultRecipient;
+    }
+
+    /**
+     * Set the fault recipient.
+     * <p/>
+     * This is the name of the service to which the fault was routed.
+     *
+     * @param faultRecipient The fault recipient.
+     */
+    public final void setFaultRecipient(final ServiceName faultRecipient)
+    {
+        this.faultRecipient = faultRecipient;
+    }
+
+    /**
+     * Get the fault message.
+     * <p/>
+     * The message at the point in time when the fault occured.
+     *
+     * @return The fault message.
+     */
+    public final Message getFaultMessage()
+    {
+        return faultMessage;
+    }
+
+    /**
+     * Set the fault message.
+     * <p/>
+     * The message at the point in time when the fault occured.
+     *
+     * @param faultMessage The fault message.
+     */
+    public final void setFaultMessage(final Message faultMessage)
+    {
+        if (this.faultMessage == null)
+        {
+            this.faultMessage = faultMessage;
+        }
+    }
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/InvocationContext.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/InvocationContext.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/InvocationContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,158 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.context;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * InvocationContext Context.
- * <p/>
- * Mutable context scoped around a ServiceInvocation.
- *
- * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
- */
-public class InvocationContext implements ESBContext, Serializable
-{
-    /**
-     * Context ThreadLocal.
-     */
-    private static ThreadLocal<InvocationContext> contextTL = new ThreadLocal<InvocationContext>();
-    /**
-     * Context Data Map.
-     */
-    private Map<Object, Object> contextMap = new LinkedHashMap<Object, Object>();
-    /**
-     * Invocation Parameters.
-     */
-    private Map<String, String> invocationParameters = new LinkedHashMap<String, String>();
-    /**
-     * Fault context.
-     */
-    private FaultContext faultContext = new FaultContext();
-
-    /**
-     * Public default constructor.
-     */
-    public InvocationContext()
-    {
-    }
-
-    /**
-     * Public constructor.
-     * <p/>
-     * The invocation parameters pass along with the
-     * {@link org.jboss.esb.message.Message}.
-     *
-     * @param invocationParameters The invocation parameters.
-     */
-    public InvocationContext(final Map<String, String> invocationParameters)
-    {
-        this.invocationParameters = invocationParameters;
-    }
-
-    /**
-     * Set the {@link InvocationContext} associated with the current thread.
-     *
-     * @param context The {@link InvocationContext} associated with the current thread.
-     */
-    public static void setContext(final InvocationContext context)
-    {
-        if (context != null)
-        {
-            contextTL.set(context);
-        }
-        else
-        {
-            contextTL.remove();
-        }
-    }
-
-    /**
-     * Get the {@link InvocationContext} associated with the message currently
-     * being processed.
-     *
-     * @return The {@link InvocationContext} associated with the message currently
-     *         being processed.
-     */
-    public static InvocationContext getContext()
-    {
-        return contextTL.get();
-    }
-
-    /**
-     * Get the Object from the context using the supplied key.
-     *
-     * @param key The context key.
-     * @return The Object bound under the supplied context key, otherwise false.
-     */
-    public final Object getContextObject(final Object key)
-    {
-        return contextMap.get(key);
-    }
-
-    /**
-     * Set the value Object into the context using the supplied key.
-     *
-     * @param key   The context key.
-     * @param value The value object to be set in the context.
-     */
-    public final void setContextObject(final Object key, final Object value)
-    {
-        contextMap.put(key, value);
-    }
-
-    /**
-     * Get the context Map.
-     *
-     * @return The context Map.
-     */
-    public final Map<Object, Object> getAll()
-    {
-        return contextMap;
-    }
-
-    /**
-     * Get the invocation parameters provided with the initial
-     * service invocation.
-     * <p/>
-     * These parameters pass along with the {@link org.jboss.esb.message.Message}
-     *
-     * @return The invocation parameters.
-     */
-    public final Map<String, String> getInvocationParameters()
-    {
-        return invocationParameters;
-    }
-
-    /**
-     * Get the fault context.
-     *
-     * @return The fault context.
-     */
-    public final FaultContext getFaultContext()
-    {
-        return faultContext;
-    }
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/InvocationContext.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/InvocationContext.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/InvocationContext.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/InvocationContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,158 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.context;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * InvocationContext Context.
+ * <p/>
+ * Mutable context scoped around a ServiceInvocation.
+ *
+ * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
+ */
+public class InvocationContext implements ESBContext, Serializable
+{
+    /**
+     * Context ThreadLocal.
+     */
+    private static ThreadLocal<InvocationContext> contextTL = new ThreadLocal<InvocationContext>();
+    /**
+     * Context Data Map.
+     */
+    private Map<Object, Object> contextMap = new LinkedHashMap<Object, Object>();
+    /**
+     * Invocation Parameters.
+     */
+    private Map<String, String> invocationParameters = new LinkedHashMap<String, String>();
+    /**
+     * Fault context.
+     */
+    private FaultContext faultContext = new FaultContext();
+
+    /**
+     * Public default constructor.
+     */
+    public InvocationContext()
+    {
+    }
+
+    /**
+     * Public constructor.
+     * <p/>
+     * The invocation parameters pass along with the
+     * {@link org.jboss.esb.api.message.Message}.
+     *
+     * @param invocationParameters The invocation parameters.
+     */
+    public InvocationContext(final Map<String, String> invocationParameters)
+    {
+        this.invocationParameters = invocationParameters;
+    }
+
+    /**
+     * Set the {@link InvocationContext} associated with the current thread.
+     *
+     * @param context The {@link InvocationContext} associated with the current thread.
+     */
+    public static void setContext(final InvocationContext context)
+    {
+        if (context != null)
+        {
+            contextTL.set(context);
+        }
+        else
+        {
+            contextTL.remove();
+        }
+    }
+
+    /**
+     * Get the {@link InvocationContext} associated with the message currently
+     * being processed.
+     *
+     * @return The {@link InvocationContext} associated with the message currently
+     *         being processed.
+     */
+    public static InvocationContext getContext()
+    {
+        return contextTL.get();
+    }
+
+    /**
+     * Get the Object from the context using the supplied key.
+     *
+     * @param key The context key.
+     * @return The Object bound under the supplied context key, otherwise false.
+     */
+    public final Object getContextObject(final Object key)
+    {
+        return contextMap.get(key);
+    }
+
+    /**
+     * Set the value Object into the context using the supplied key.
+     *
+     * @param key   The context key.
+     * @param value The value object to be set in the context.
+     */
+    public final void setContextObject(final Object key, final Object value)
+    {
+        contextMap.put(key, value);
+    }
+
+    /**
+     * Get the context Map.
+     *
+     * @return The context Map.
+     */
+    public final Map<Object, Object> getAll()
+    {
+        return contextMap;
+    }
+
+    /**
+     * Get the invocation parameters provided with the initial
+     * service invocation.
+     * <p/>
+     * These parameters pass along with the {@link org.jboss.esb.api.message.Message}
+     *
+     * @return The invocation parameters.
+     */
+    public final Map<String, String> getInvocationParameters()
+    {
+        return invocationParameters;
+    }
+
+    /**
+     * Get the fault context.
+     *
+     * @return The fault context.
+     */
+    public final FaultContext getFaultContext()
+    {
+        return faultContext;
+    }
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ResourceLocator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/ResourceLocator.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ResourceLocator.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
- * LLC, and individual contributors by the @authors tag. See the copyright.txt
- * in the distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this software; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- * site: http://www.fsf.org.
- */
-package org.jboss.esb.context;
-
-import java.io.InputStream;
-
-/**
- * A ResourceLocator is intended to be used by any code in the ESB
- * that needs to access resources from a deployment.
- * <p/>
- * Different implementations can use different means to retreive
- * the resources.
- *
- * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
- *
- */
-public interface ResourceLocator
-{
-    /**
-     * Load the specified class.
-     *
-     * @param className The name of the class to load.
-     * @return The specified class.
-     * @throws ClassNotFoundException If the class cannot be found.
-     */
-    Class<?> forName(final String className) throws ClassNotFoundException;
-
-    /**
-     * Load the specified class using the passed in class's classloader.
-     *
-     * @param className The name of the class to load.
-     * @param caller    The class of the caller.
-     * @return The specified class.
-     * @throws ClassNotFoundException If the class cannot be found.
-     */
-    Class<?> forName(final String className, final Class<?> caller) throws ClassNotFoundException;
-
-    /**
-     * Get a resource from the callers classpath.
-     *
-     * @param resourceName - the name of the resource to be retrieved.
-     * @param caller - the class of the caller. The classes classloader will be used to search for the resource.
-     * @return InputStream - the InputStream for the resource.
-     */
-    InputStream getResourceAsStream(final String resourceName, final Class<?> caller);
-
-    /**
-     * Get the underlying classloader.
-     * @return The underlying ClassLoader.
-     */
-    ClassLoader getClassLoader();
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ResourceLocator.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/ResourceLocator.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ResourceLocator.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/ResourceLocator.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source Copyright 2008, Red Hat Middleware
+ * LLC, and individual contributors by the @authors tag. See the copyright.txt
+ * in the distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this software; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
+ * site: http://www.fsf.org.
+ */
+package org.jboss.esb.api.context;
+
+import java.io.InputStream;
+
+/**
+ * A ResourceLocator is intended to be used by any code in the ESB
+ * that needs to access resources from a deployment.
+ * <p/>
+ * Different implementations can use different means to retreive
+ * the resources.
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ *
+ */
+public interface ResourceLocator
+{
+    /**
+     * Load the specified class.
+     *
+     * @param className The name of the class to load.
+     * @return The specified class.
+     * @throws ClassNotFoundException If the class cannot be found.
+     */
+    Class<?> forName(final String className) throws ClassNotFoundException;
+
+    /**
+     * Load the specified class using the passed in class's classloader.
+     *
+     * @param className The name of the class to load.
+     * @param caller    The class of the caller.
+     * @return The specified class.
+     * @throws ClassNotFoundException If the class cannot be found.
+     */
+    Class<?> forName(final String className, final Class<?> caller) throws ClassNotFoundException;
+
+    /**
+     * Get a resource from the callers classpath.
+     *
+     * @param resourceName - the name of the resource to be retrieved.
+     * @param caller - the class of the caller. The classes classloader will be used to search for the resource.
+     * @return InputStream - the InputStream for the resource.
+     */
+    InputStream getResourceAsStream(final String resourceName, final Class<?> caller);
+
+    /**
+     * Get the underlying classloader.
+     * @return The underlying ClassLoader.
+     */
+    ClassLoader getClassLoader();
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/package.html
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/package.html	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,8 +0,0 @@
-<html>
-<head></head>
-<body>
-ESB Context.
-
-<h2>Package Specification</h2>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/package.html (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/package.html)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/package.html	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/context/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+ESB Context.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception (from rev 23464, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/exception)

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/JBossESBException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/exception/JBossESBException.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/JBossESBException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.exception;
-
-/**
- * Base JBossESB Exception.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class JBossESBException extends Exception
-{
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Public Constructor.
-     *
-     * @param message Exception message.
-     */
-    public JBossESBException(final String message)
-    {
-        super(message);
-    }
-
-    /**
-     * Public Constructor.
-     *
-     * @param message Exception message.
-     * @param cause   Exception cause.
-     */
-    public JBossESBException(final String message, final Throwable cause)
-    {
-        super(message, cause);
-    }
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/JBossESBException.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/exception/JBossESBException.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/JBossESBException.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/JBossESBException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.exception;
+
+/**
+ * Base JBossESB Exception.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class JBossESBException extends Exception
+{
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Public Constructor.
+     *
+     * @param message Exception message.
+     */
+    public JBossESBException(final String message)
+    {
+        super(message);
+    }
+
+    /**
+     * Public Constructor.
+     *
+     * @param message Exception message.
+     * @param cause   Exception cause.
+     */
+    public JBossESBException(final String message, final Throwable cause)
+    {
+        super(message, cause);
+    }
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/package.html
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/exception/package.html	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,8 +0,0 @@
-<html>
-<head></head>
-<body>
-ESB Service Exception classes.
-
-<h2>Package Specification</h2>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/package.html (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/exception/package.html)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/package.html	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/exception/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+ESB Service Exception classes.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message (from rev 23464, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message)

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/Message.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/Message.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/Message.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,170 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.message;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * JBoss ESB Message.
- * <p/>
- * <b>Note</b>: <i>For those moving from JBossESB 4.x, please read the
- * <a href="doc-files/4.x-to-5.x-devnotes.html#message">4.x to 5.x Developer Notes</a></i>.
- *
- * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
- */
-public class Message implements Serializable
-{
-    // TODO: Make Externalizable
-
-    /**
-     * Primary Payload.
-     * <p/>
-     * Don't change this to be Serializable.  The Message only needs to be
-     * Serializable if it needs to go onto a Bus, which is not always the case.
-     */
-    private Object payload;
-    /**
-     * Attachments.
-     * <p/>
-     * Don't change these to be Serializable.  The Message only needs to be
-     * Serializable if it needs to go onto a Bus, which is not always the case.
-     */
-    private Map<String, Object> attachments = new LinkedHashMap<String, Object>();
-
-    /**
-     * Public default constructor.
-     */
-    public Message()
-    {
-    }
-
-    /**
-     * Public default constructor.
-     *
-     * @param payload Message payload.
-     */
-    public Message(final Object payload)
-    {
-        /*
-         * Don't change this to be Serializable.  The Message only needs to be
-         * Serializable if it needs to go onto a Bus, which is not always the case.
-         */
-        this.payload = payload;
-    }
-
-    /**
-     * Get the primary payload Object.
-     *
-     * @return The primary payload Object.
-     */
-    public final Object getPayload()
-    {
-        /*
-         * Don't change this to be Serializable.  The Message only needs to be
-         * Serializable if it needs to go onto a Bus, which is not always the case.
-         */
-        return payload;
-    }
-
-    /**
-     * Set the primary payload Object.
-     *
-     * @param payload The primary payload Object.
-     */
-    public final void setPayload(final Object payload)
-    {
-        /*
-         * Don't change this to be Serializable.  The Message only needs to be
-         * Serializable if it needs to go onto a Bus, which is not always the case.
-         */
-        this.payload = payload;
-    }
-
-    /**
-     * Get the message attachments.
-     *
-     * @return Message attachments.
-     */
-    public final Map<String, Object> getAttachments()
-    {
-        /*
-         * Don't change these to be Serializable.  The Message only needs to be
-         * Serializable if it needs to go onto a Bus, which is not always the case.
-         */
-        return attachments;
-    }
-
-    /**
-     * Set the message attachments.
-     *
-     * @param attachments Message attachments.
-     */
-    public final void setAttachments(final Map<String, Object> attachments)
-    {
-        /*
-         * Don't change these to be Serializable.  The Message only needs to be
-         * Serializable if it needs to go onto a Bus, which is not always the case.
-         */
-        this.attachments = attachments;
-    }
-
-    /**
-     * Create a shallow clone of the message.
-     *
-     * @return A Shallow clone of the message.
-     */
-    public final Object clone()
-    {
-        Message clone = new Message(payload);
-        clone.getAttachments().putAll(getAttachments());
-        return clone;
-    }
-
-    /**
-     * Object hash.
-     * <p/>
-     * Finalizing this method.
-     *
-     * @return The Object hash (as per the {@link Object} class implementation).
-     */
-    public final int hashCode()
-    {
-        return super.hashCode();
-    }
-
-    /**
-     * Object equals.
-     * <p/>
-     * Finalizing this method.
-     *
-     * @param obj The object to be compared against.
-     * @return True if the Object is equal (as per the {@link Object} class implementation),
-     *         otherwise false.
-     */
-    public final boolean equals(final Object obj)
-    {
-        return super.equals(obj);
-    }
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/Message.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/Message.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/Message.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/Message.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,170 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.message;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * JBoss ESB Message.
+ * <p/>
+ * <b>Note</b>: <i>For those moving from JBossESB 4.x, please read the
+ * <a href="doc-files/4.x-to-5.x-devnotes.html#message">4.x to 5.x Developer Notes</a></i>.
+ *
+ * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
+ */
+public class Message implements Serializable
+{
+    // TODO: Make Externalizable
+
+    /**
+     * Primary Payload.
+     * <p/>
+     * Don't change this to be Serializable.  The Message only needs to be
+     * Serializable if it needs to go onto a Bus, which is not always the case.
+     */
+    private Object payload;
+    /**
+     * Attachments.
+     * <p/>
+     * Don't change these to be Serializable.  The Message only needs to be
+     * Serializable if it needs to go onto a Bus, which is not always the case.
+     */
+    private Map<String, Object> attachments = new LinkedHashMap<String, Object>();
+
+    /**
+     * Public default constructor.
+     */
+    public Message()
+    {
+    }
+
+    /**
+     * Public default constructor.
+     *
+     * @param payload Message payload.
+     */
+    public Message(final Object payload)
+    {
+        /*
+         * Don't change this to be Serializable.  The Message only needs to be
+         * Serializable if it needs to go onto a Bus, which is not always the case.
+         */
+        this.payload = payload;
+    }
+
+    /**
+     * Get the primary payload Object.
+     *
+     * @return The primary payload Object.
+     */
+    public final Object getPayload()
+    {
+        /*
+         * Don't change this to be Serializable.  The Message only needs to be
+         * Serializable if it needs to go onto a Bus, which is not always the case.
+         */
+        return payload;
+    }
+
+    /**
+     * Set the primary payload Object.
+     *
+     * @param payload The primary payload Object.
+     */
+    public final void setPayload(final Object payload)
+    {
+        /*
+         * Don't change this to be Serializable.  The Message only needs to be
+         * Serializable if it needs to go onto a Bus, which is not always the case.
+         */
+        this.payload = payload;
+    }
+
+    /**
+     * Get the message attachments.
+     *
+     * @return Message attachments.
+     */
+    public final Map<String, Object> getAttachments()
+    {
+        /*
+         * Don't change these to be Serializable.  The Message only needs to be
+         * Serializable if it needs to go onto a Bus, which is not always the case.
+         */
+        return attachments;
+    }
+
+    /**
+     * Set the message attachments.
+     *
+     * @param attachments Message attachments.
+     */
+    public final void setAttachments(final Map<String, Object> attachments)
+    {
+        /*
+         * Don't change these to be Serializable.  The Message only needs to be
+         * Serializable if it needs to go onto a Bus, which is not always the case.
+         */
+        this.attachments = attachments;
+    }
+
+    /**
+     * Create a shallow clone of the message.
+     *
+     * @return A Shallow clone of the message.
+     */
+    public final Object clone()
+    {
+        Message clone = new Message(payload);
+        clone.getAttachments().putAll(getAttachments());
+        return clone;
+    }
+
+    /**
+     * Object hash.
+     * <p/>
+     * Finalizing this method.
+     *
+     * @return The Object hash (as per the {@link Object} class implementation).
+     */
+    public final int hashCode()
+    {
+        return super.hashCode();
+    }
+
+    /**
+     * Object equals.
+     * <p/>
+     * Finalizing this method.
+     *
+     * @param obj The object to be compared against.
+     * @return True if the Object is equal (as per the {@link Object} class implementation),
+     *         otherwise false.
+     */
+    public final boolean equals(final Object obj)
+    {
+        return super.equals(obj);
+    }
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessingException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessingException.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessingException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.message;
-
-import org.jboss.esb.exception.JBossESBException;
-
-/**
- * Message Processing Exception.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class MessageProcessingException extends JBossESBException
-{
-
-    /**
-     * Public Constructor.
-     *
-     * @param message Exception message.
-     */
-    public MessageProcessingException(final String message)
-    {
-        super(message);
-    }
-
-    /**
-     * Public Constructor.
-     *
-     * @param message Exception message.
-     * @param cause   Exception cause.
-     */
-    public MessageProcessingException(final String message, final Throwable cause)
-    {
-        super(message, cause);
-    }
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessingException.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessingException.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessingException.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessingException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.message;
+
+import org.jboss.esb.api.exception.JBossESBException;
+
+/**
+ * Message Processing Exception.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class MessageProcessingException extends JBossESBException
+{
+
+    /**
+     * Public Constructor.
+     *
+     * @param message Exception message.
+     */
+    public MessageProcessingException(final String message)
+    {
+        super(message);
+    }
+
+    /**
+     * Public Constructor.
+     *
+     * @param message Exception message.
+     * @param cause   Exception cause.
+     */
+    public MessageProcessingException(final String message, final Throwable cause)
+    {
+        super(message, cause);
+    }
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessor.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessor.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessor.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.message;
-
-/**
- * Message Processor Interface.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public interface MessageProcessor
-{
-    /**
-     * Process the message.
-     *
-     * @param message The message to be processed.
-     * @return Message The message object.
-     * @throws MessageProcessingException An exception occured while processing the message.
-     */
-    Message process(final Message message) throws MessageProcessingException;
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessor.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageProcessor.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessor.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/MessageProcessor.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.message;
+
+/**
+ * Message Processor Interface.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public interface MessageProcessor
+{
+    /**
+     * Process the message.
+     *
+     * @param message The message to be processed.
+     * @return Message The message object.
+     * @throws MessageProcessingException An exception occured while processing the message.
+     */
+    Message process(final Message message) throws MessageProcessingException;
+}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/doc-files (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/doc-files)

Modified: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/doc-files/4.x-to-5.x-devnotes.html
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/doc-files/4.x-to-5.x-devnotes.html	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/doc-files/4.x-to-5.x-devnotes.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" TITLE="Style"/>
+    <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" TITLE="Style"/>
 </head>
 <body>
 <h2>Notes for JBossESB 4.x Developers Moving to JBossESB 5.x</h2>
@@ -28,14 +28,14 @@
         <td>Contextual info (e.g. Addressing/Call info) passed around with the Message.</td>
         <td>Contextual info not available on the Message. This information can be
             accessed via the classes defined in the <a
-                href="../../context/package-summary.html">org.jboss.esb.context</a> package.
+                href="../../context/package-summary.html">org.jboss.esb.api.context</a> package.
         </td>
     </tr>
     <tr>
         <td>Contextual information getting stored on the Message, causing "pollution" of
             the Message.
         </td>
-        <td>Proper "Context" objects are now available through the <a href="../../context/package-summary.html">org.jboss.esb.context</a>
+        <td>Proper "Context" objects are now available through the <a href="../../context/package-summary.html">org.jboss.esb.api.context</a>
             package. No need to polute the Message.
         </td>
     </tr>

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/package.html
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/package.html	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,8 +0,0 @@
-<html>
-<head></head>
-<body>
-ESB Message.
-
-<h2>Package Specification</h2>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/package.html (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/package.html)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/package.html	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/message/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+ESB Message.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/package.html (from rev 23464, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/package.html)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/package.html	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+JBoss ESB Public API.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/FilterEvaluator.java (from rev 23464, labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/FilterEvaluator.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/FilterEvaluator.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/FilterEvaluator.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.routing;
+
+import org.jboss.esb.api.message.Message;
+
+/**
+ * Routing filter evaluator.
+ * <p/>
+ * Filters can be applied to inbound and outbound routers.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public interface FilterEvaluator
+{
+    /**
+     * Filter the message.
+     *
+     * @param message The message to be evaluated.
+     * @return True if the message is to be filtered through.  False if the message is to be filtered out.
+     */
+    boolean filterMessage(Message message);
+}


Property changes on: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/FilterEvaluator.java
___________________________________________________________________
Name: svn:eol-style
   + native

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/InboundRouter.java (from rev 23464, labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/InboundRouter.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/InboundRouter.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/InboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.routing;
+
+/**
+ * Inbound Router.
+ * <h3>Deployment Context</h3>
+ * An instance can have its associated {@link org.jboss.esb.api.context.DeploymentContext}
+ * set by simply defining a property by the name "deploymentContext" e.g.
+ * <pre>
+ * public MyRouter implements InboundRouter {
+ *      {@link org.jboss.esb.api.context.DeploymentContext} deploymentContext;
+ * }
+ * </pre>
+ * The framework will inject the value.
+ * <h3>Service Name</h3>
+ * An instance can have its associated {@link org.jboss.esb.api.service.ServiceName}
+ * set by simply defining a property by the name "serviceName" e.g.
+ * <pre>
+ * public MyRouter implements InboundRouter {
+ *      {@link org.jboss.esb.api.service.ServiceName} serviceName;
+ * }
+ * </pre>
+ * The framework will inject the value.
+ * <h3>Configuration Name</h3>
+ * An instance can have its associated configuration name (name, id etc from the configuration)
+ * set by simply defining a property by the name "objectName" e.g.
+ * <pre>
+ * public MyRouter implements InboundRouter {
+ *      String objectName;
+ * }
+ * </pre>
+ * The framework will inject the value.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public interface InboundRouter
+{
+    // TODO: Add support for filtering inbound messages, allowing sharing/reuse of inbound endpoints across 1+ services
+
+    /**
+     * Set the {@link MessageDispatcher} for the router.
+     * <p/>
+     * Implementations use the dispatcher to dispatch messages to the
+     * consuming Service.  The ESB runtime handles the details of delivering the
+     * message to the interested Service.
+     *
+     * @param dispatcher The {@link MessageDispatcher} instance.
+     */
+    void setDispatcher(MessageDispatcher dispatcher);
+}


Property changes on: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/InboundRouter.java
___________________________________________________________________
Name: svn:eol-style
   + native

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/MessageDispatcher.java (from rev 23464, labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/MessageDispatcher.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/MessageDispatcher.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/MessageDispatcher.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.routing;
+
+import org.jboss.esb.api.context.InvocationContext;
+import org.jboss.esb.api.message.Message;
+
+/**
+ * Message Dispatcher.
+ * <p/>
+ * An implementation of this class is injected into every {@link InboundRouter}
+ * instance, which uses it to dispatch the Messages it is receiving to the
+ * target Service that is interested in them.  Basically, it's a mechanism
+ * for allowing the router to forward the Message to the core ESB runtime for
+ * dispatch to the target Service.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public interface MessageDispatcher
+{
+    /**
+     * Dispatch the message to the target service.
+     *
+     * @param message           The message to be dispatched.
+     * @param invocationContext The InvocationContext for the message dispatch.
+     */
+    void dispatch(Message message, InvocationContext invocationContext);
+
+    /**
+     * Is the dispatcher instance processing messages.
+     * <p/>
+     * This is required by the undeploy process.  After uninitializing
+     * all {@link InboundRouter} instances, the undeploy waits untill
+     * all dispatchers have completed processing all their messages before
+     * continuing with the undeploy (uninitializing all other components
+     * and resources).
+     *
+     * @return True if the dispatcher has active messages that it is
+     *         processing, otherwise false.
+     */
+    boolean isProcessingMessages();
+}


Property changes on: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/MessageDispatcher.java
___________________________________________________________________
Name: svn:eol-style
   + native

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/OutboundRouter.java (from rev 23464, labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/OutboundRouter.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/OutboundRouter.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/OutboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.routing;
+
+import org.jboss.esb.api.message.Message;
+
+/**
+ * Outbound Router.
+ * <h3>Deployment Context</h3>
+ * An instance can have its associated {@link org.jboss.esb.api.context.DeploymentContext}
+ * set by simply defining a property by the name "deploymentContext" e.g.
+ * <pre>
+ * public MyRouter implements OutboundRouter {
+ *      {@link org.jboss.esb.api.context.DeploymentContext} deploymentContext;
+ * }
+ * </pre>
+ * The framework will inject the value.
+ * <h3>Service Name</h3>
+ * An instance can have its associated {@link org.jboss.esb.api.service.ServiceName}
+ * set by simply defining a property by the name "serviceName" e.g.
+ * <pre>
+ * public MyRouter implements OutboundRouter {
+ *      {@link org.jboss.esb.api.service.ServiceName} serviceName;
+ * }
+ * </pre>
+ * The framework will inject the value.
+ * <h3>Configuration Name</h3>
+ * An instance can have its associated configuration name (name, id etc from the configuration)
+ * set by simply defining a property by the name "objectName" e.g.
+ * <pre>
+ * public MyRouter implements OutboundRouter {
+ *      String objectName;
+ * }
+ * </pre>
+ * The framework will inject the value.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public interface OutboundRouter
+{
+    // TODO: Add support for filtering outbound messages.  Content based routing??
+
+    /**
+     * Route the message.
+     *
+     * @param message The message to be routed.
+     * @throws RoutingException An exception occured while routing the message.
+     */
+    void route(Message message) throws RoutingException;
+}
\ No newline at end of file


Property changes on: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/OutboundRouter.java
___________________________________________________________________
Name: svn:eol-style
   + native

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/RoutingException.java (from rev 23464, labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/RoutingException.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/RoutingException.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/RoutingException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.routing;
+
+import org.jboss.esb.api.exception.JBossESBException;
+
+/**
+ * Routing exception.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class RoutingException extends JBossESBException
+{
+    /**
+     * Public Constructor.
+     *
+     * @param message Exception message.
+     */
+    public RoutingException(final String message)
+    {
+        super(message);
+    }
+
+    /**
+     * Public Constructor.
+     *
+     * @param message Exception message.
+     * @param cause   Exception cause.
+     */
+    public RoutingException(final String message, final Throwable cause)
+    {
+        super(message, cause);
+    }
+}


Property changes on: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/RoutingException.java
___________________________________________________________________
Name: svn:eol-style
   + native

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/package.html (from rev 23464, labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/package.html)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/package.html	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/routing/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+ESB Message Routing.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service (from rev 23464, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service)

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/Service.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/Service.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/Service.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.service;
-
-import org.jboss.esb.message.Message;
-import org.jboss.esb.message.MessageProcessor;
-
-/**
- * ESB Service interface.
- * <h3>Deployment Context</h3>
- * An instance can have its associated {@link org.jboss.esb.context.DeploymentContext}
- * set by simply defining a property by the name "deploymentContext" e.g.
- * <pre>
- * public MyService implements Service {
- *      {@link org.jboss.esb.context.DeploymentContext} deploymentContext;
- * }
- * </pre>
- * The framework will inject the value.
- * <h3>Service Name</h3>
- * An instance can have its associated {@link org.jboss.esb.service.ServiceName}
- * set by simply defining a property by the name "serviceName" e.g.
- * <pre>
- * public MyService implements Service {
- *      {@link org.jboss.esb.service.ServiceName} serviceName;
- * }
- * </pre>
- * The framework will inject the value.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public interface Service extends MessageProcessor
-{
-    /**
-     * Service process method.
-     * @param message The message to be processed.
-     * @return The resultant {@link Message}.
-     * @throws ServiceException Service exception processing the message.
-     */
-    Message process(final Message message) throws ServiceException;
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/Service.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/Service.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/Service.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/Service.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.service;
+
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.message.MessageProcessor;
+
+/**
+ * ESB Service interface.
+ * <h3>Deployment Context</h3>
+ * An instance can have its associated {@link org.jboss.esb.api.context.DeploymentContext}
+ * set by simply defining a property by the name "deploymentContext" e.g.
+ * <pre>
+ * public MyService implements Service {
+ *      {@link org.jboss.esb.api.context.DeploymentContext} deploymentContext;
+ * }
+ * </pre>
+ * The framework will inject the value.
+ * <h3>Service Name</h3>
+ * An instance can have its associated {@link org.jboss.esb.api.service.ServiceName}
+ * set by simply defining a property by the name "serviceName" e.g.
+ * <pre>
+ * public MyService implements Service {
+ *      {@link org.jboss.esb.api.service.ServiceName} serviceName;
+ * }
+ * </pre>
+ * The framework will inject the value.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public interface Service extends MessageProcessor
+{
+    /**
+     * Service process method.
+     * @param message The message to be processed.
+     * @return The resultant {@link Message}.
+     * @throws ServiceException Service exception processing the message.
+     */
+    Message process(final Message message) throws ServiceException;
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceException.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.service;
-
-import org.jboss.esb.message.MessageProcessingException;
-
-/**
- * Service Exception.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class ServiceException extends MessageProcessingException
-{
-    /**
-     * Public Constructor.
-     *
-     * @param message Exception message.
-     */
-    public ServiceException(final String message)
-    {
-        super(message);
-    }
-
-    /**
-     * Public Constructor.
-     *
-     * @param message Exception message.
-     * @param cause   Exception cause.
-     */
-    public ServiceException(final String message, final Throwable cause)
-    {
-        super(message, cause);
-    }
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceException.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceException.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceException.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.service;
+
+import org.jboss.esb.api.message.MessageProcessingException;
+
+/**
+ * Service Exception.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class ServiceException extends MessageProcessingException
+{
+    /**
+     * Public Constructor.
+     *
+     * @param message Exception message.
+     */
+    public ServiceException(final String message)
+    {
+        super(message);
+    }
+
+    /**
+     * Public Constructor.
+     *
+     * @param message Exception message.
+     * @param cause   Exception cause.
+     */
+    public ServiceException(final String message, final Throwable cause)
+    {
+        super(message, cause);
+    }
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceMEP.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceMEP.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceMEP.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.service;
-
-/**
- * Service Message Exchange Pattern (MEP) enumeration.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public enum ServiceMEP
-{
-    /**
-     * Service only accepts messages.  Doesn't support 'replyTo'.
-     */
-    InOnly,
-    /**
-     * Service only sends messages.  Doesn't support invocation.
-     * <p/>
-     * An example of such a service might be a scheduled Service that
-     * periodically queries a DB, from which it generates a message
-     * and sends it to another Service or OutboundRouter.
-     */
-    OutOnly,
-    /**
-     * Service accepts messages.  Supports 'replyTo'.
-     */
-    InOut;
-}
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceMEP.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceMEP.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceMEP.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceMEP.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.service;
+
+/**
+ * Service Message Exchange Pattern (MEP) enumeration.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public enum ServiceMEP
+{
+    /**
+     * Service only accepts messages.  Doesn't support 'replyTo'.
+     */
+    InOnly,
+    /**
+     * Service only sends messages.  Doesn't support invocation.
+     * <p/>
+     * An example of such a service might be a scheduled Service that
+     * periodically queries a DB, from which it generates a message
+     * and sends it to another Service or OutboundRouter.
+     */
+    OutOnly,
+    /**
+     * Service accepts messages.  Supports 'replyTo'.
+     */
+    InOut;
+}
\ No newline at end of file

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceName.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceName.java	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceName.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,138 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.service;
-
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.util.AssertArgument;
-
-import java.io.Serializable;
-
-/**
- * Service Name.
- *
- * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
- * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
- * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
- * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
- */
-public final class ServiceName implements Serializable
-{
-
-    /**
-     * Service Category.
-     */
-    @Property
-    private String category = null;
-    /**
-     * Service Name.
-     */
-    @Property
-    private String name = null;
-
-    /**
-     * Private default constructor.
-     * <p/>
-     * This private constructor is provided so that this class can still be
-     * created reflectively.
-     */
-    @SuppressWarnings("unused")
-    private ServiceName()
-    {
-    }
-
-    /**
-     * Public constructor.
-     *
-     * @param category Service Category.
-     * @param name     Service Name.
-     */
-    public ServiceName(final String category, final String name)
-    {
-        AssertArgument.isNotNullAndNotEmpty(category, "category");
-        AssertArgument.isNotNullAndNotEmpty(name, "name");
-        this.category = category;
-        this.name = name;
-    }
-
-    /**
-     * Get the Service Category.
-     *
-     * @return Service Category.
-     */
-    public String getCategory()
-    {
-        return category;
-    }
-
-    /**
-     * Get the Service Name.
-     *
-     * @return The Service Name.
-     */
-    public String getName()
-    {
-        return name;
-    }
-
-    /**
-     * ServiceName toString.
-     *
-     * @return The Service Category and Name concatenated.
-     */
-    @Override
-    public String toString()
-    {
-        return (category + ":" + name);
-    }
-
-    /**
-     * Equals method.
-     *
-     * @param obj Object to compare against.
-     * @return True if the object is a ServiceName with the same category and name values, otherwise false.
-     */
-    @Override
-    public boolean equals(final Object obj)
-    {
-        if (obj == null)
-        {
-            return false;
-        } else if (obj == this)
-        {
-            return true;
-        } else if (!(obj instanceof ServiceName))
-        {
-            return false;
-        }
-
-        return (obj.hashCode() == hashCode());
-    }
-
-    /**
-     * Object hash method.
-     *
-     * @return Object hash value.
-     */
-    @Override
-    public int hashCode()
-    {
-        return toString().hashCode();
-    }
-}

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceName.java (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceName.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceName.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/ServiceName.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,155 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.service;
+
+import org.jboss.esb.api.annotations.Property;
+
+import java.io.Serializable;
+
+/**
+ * Service Name.
+ *
+ * @author <a href="mailto:Kevin.Conner at jboss.com">Kevin Conner</a>
+ * @author <a href="mailto:tcunning at redhat.com">Tom Cunningham</a>
+ * @author <a href="mailto:dbevenius at redhat.com">Daniel Bevenius</a>
+ * @author <a href="mailto:tom.fennelly at jboss.com">Tom Fennelly</a>
+ */
+public final class ServiceName implements Serializable
+{
+
+    /**
+     * Service Category.
+     */
+    @Property
+    private String category = null;
+    /**
+     * Service Name.
+     */
+    @Property
+    private String name = null;
+
+    /**
+     * Private default constructor.
+     * <p/>
+     * This private constructor is provided so that this class can still be
+     * created reflectively.
+     */
+    @SuppressWarnings("unused")
+    private ServiceName()
+    {
+    }
+
+    /**
+     * Public constructor.
+     *
+     * @param category Service Category.
+     * @param name     Service Name.
+     */
+    public ServiceName(final String category, final String name)
+    {
+        isNotNullAndNotEmpty(category, "category");
+        isNotNullAndNotEmpty(name, "name");
+
+        this.category = category;
+        this.name = name;
+    }
+
+    /**
+     * Get the Service Category.
+     *
+     * @return Service Category.
+     */
+    public String getCategory()
+    {
+        return category;
+    }
+
+    /**
+     * Get the Service Name.
+     *
+     * @return The Service Name.
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /**
+     * ServiceName toString.
+     *
+     * @return The Service Category and Name concatenated.
+     */
+    @Override
+    public String toString()
+    {
+        return (category + ":" + name);
+    }
+
+    /**
+     * Equals method.
+     *
+     * @param obj Object to compare against.
+     * @return True if the object is a ServiceName with the same category and name values, otherwise false.
+     */
+    @Override
+    public boolean equals(final Object obj)
+    {
+        if (obj == null)
+        {
+            return false;
+        } else if (obj == this)
+        {
+            return true;
+        } else if (!(obj instanceof ServiceName))
+        {
+            return false;
+        }
+
+        return (obj.hashCode() == hashCode());
+    }
+
+    /**
+     * Object hash method.
+     *
+     * @return Object hash value.
+     */
+    @Override
+    public int hashCode()
+    {
+        return toString().hashCode();
+    }
+
+    /**
+     * Assert that the argument is neither null nor empty.
+     *
+     * @param arg     Argument.
+     * @param argName Argument name.
+     * @return The supplied "arg" argument.
+     * @throws IllegalArgumentException Argument is null or empty.
+     */
+    private void isNotNullAndNotEmpty(final String arg, final String argName) throws IllegalArgumentException
+    {
+        if (arg == null || arg.trim().equals(""))
+        {
+            throw new IllegalArgumentException("null or empty '" + argName
+                    + "' arg in method call.");
+        }
+    }
+}

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/package.html
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/package.html	2008-10-15 18:14:17 UTC (rev 23464)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,8 +0,0 @@
-<html>
-<head></head>
-<body>
-ESb Service.
-
-<h2>Package Specification</h2>
-</body>
-</html>
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/package.html (from rev 23474, labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/package.html)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/package.html	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/api/service/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+ESb Service.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file

Deleted: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/package.html
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/package.html	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/package.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,8 +0,0 @@
-<html>
-<head></head>
-<body>
-ESb Service.
-
-<h2>Package Specification</h2>
-</body>
-</html>
\ No newline at end of file

Modified: labs/jbossesb/workspace/skeagh/api/service/src/main/java/overview.html
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/overview.html	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/overview.html	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,9 +1,9 @@
 <html>
 <head></head>
 <body>
-JBoss ESB - Service API.
+JBoss ESB Public API.
 
 <h1>Overview</h1>
-This is the Core Service API for JBoss ESB.
+This is the Core API for JBoss ESB.
 </body>
 </html>
\ No newline at end of file

Copied: labs/jbossesb/workspace/skeagh/api/service/src/test/java/org/jboss/esb/api/service/ServiceNameTest.java (from rev 23464, labs/jbossesb/workspace/skeagh/api/service/src/test/java/org/jboss/esb/service/ServiceNameTest.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/test/java/org/jboss/esb/api/service/ServiceNameTest.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/api/service/src/test/java/org/jboss/esb/api/service/ServiceNameTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.api.service;
+
+import junit.framework.TestCase;
+
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class ServiceNameTest extends TestCase
+{
+
+    public void test()
+    {
+        ServiceName sa1 = new ServiceName("ca", "na");
+        ServiceName sa2 = new ServiceName("ca", "na");
+        ServiceName sb1 = new ServiceName("cb", "nb");
+        ServiceName sb2 = new ServiceName("cb", "nb");
+        HashMap<ServiceName, String> map = new HashMap<ServiceName, String>();
+
+        assertFalse(sa1.equals(null));
+        assertFalse(sa1.equals("astring"));
+        assertFalse(sa1.equals(sb1));
+
+        assertEquals(sa1.hashCode(), sa2.hashCode());
+        assertTrue(sa1.equals(sa2));
+
+        map.put(sa1, "sa");
+        map.put(sb1, "sb");
+        assertEquals("sa", map.get(sa1));
+        assertEquals("sa", map.get(sa2));
+        assertEquals("sb", map.get(sb1));
+        assertEquals("sb", map.get(sb2));
+    }
+}


Property changes on: labs/jbossesb/workspace/skeagh/api/service/src/test/java/org/jboss/esb/api/service/ServiceNameTest.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: labs/jbossesb/workspace/skeagh/container/osgi/api/osgi.bnd
===================================================================
--- labs/jbossesb/workspace/skeagh/container/osgi/api/osgi.bnd	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/container/osgi/api/osgi.bnd	2008-10-16 13:23:19 UTC (rev 23475)
@@ -1,7 +1,2 @@
-Import-Package: !org.jboss.esb.* 
-Export-Package: org.jboss.esb.annotations, \
-                org.jboss.esb.context, \
-                org.jboss.esb.exception, \
-                org.jboss.esb.message, \
-                org.jboss.esb.routing, \
-                org.jboss.esb.service
+Import-Package: !org.jboss.esb.*
+Export-Package: org.jboss.esb.api.*

Modified: labs/jbossesb/workspace/skeagh/container/osgi/runtime/osgi.bnd
===================================================================
--- labs/jbossesb/workspace/skeagh/container/osgi/runtime/osgi.bnd	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/container/osgi/runtime/osgi.bnd	2008-10-16 13:23:19 UTC (rev 23475)
@@ -2,7 +2,7 @@
 Private-Package: org.jboss.esb.osgi
 
 # TODO: Replace global import with explicit package imports?
-Import-Package: org.jboss.esb.*, *;resolution:=optional
+Import-Package: org.jboss.esb.api.*, *;resolution:=optional
 
 Bundle-Activator: org.jboss.esb.osgi.EsbServiceDeploymentActivator
 

Modified: labs/jbossesb/workspace/skeagh/container/osgi/runtime/src/main/java/org/jboss/esb/osgi/BundleResourceLocator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/container/osgi/runtime/src/main/java/org/jboss/esb/osgi/BundleResourceLocator.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/container/osgi/runtime/src/main/java/org/jboss/esb/osgi/BundleResourceLocator.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -21,7 +21,7 @@
 package org.jboss.esb.osgi;
 
 import org.jboss.esb.classpath.ClassUtil;
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.osgi.framework.Bundle;
 
 import java.io.IOException;

Modified: labs/jbossesb/workspace/skeagh/examples/helloworld/osgi.bnd
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/helloworld/osgi.bnd	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/examples/helloworld/osgi.bnd	2008-10-16 13:23:19 UTC (rev 23475)
@@ -13,7 +13,7 @@
 
 # TODO: Version imports
 # TODO: Replace global import with explicit package imports?
-Import-Package: org.jboss.esb.jms, org.jboss.esb.*, *;resolution:=optional
+Import-Package: org.jboss.esb.jms, org.jboss.esb.api.*, *;resolution:=optional
 
 Embed-Dependency: activemq-core, \
                   backport-util-concurrent, \

Modified: labs/jbossesb/workspace/skeagh/examples/helloworld/src/main/java/org/jboss/esb/examples/helloworld/MyTestService.java
===================================================================
--- labs/jbossesb/workspace/skeagh/examples/helloworld/src/main/java/org/jboss/esb/examples/helloworld/MyTestService.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/examples/helloworld/src/main/java/org/jboss/esb/examples/helloworld/MyTestService.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,9 +19,9 @@
  */
 package org.jboss.esb.examples.helloworld;
 
-import org.jboss.esb.message.Message;
-import org.jboss.esb.service.Service;
-import org.jboss.esb.service.ServiceException;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.service.Service;
+import org.jboss.esb.api.service.ServiceException;
 
 /**
  * Simple Test service.

Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInboundRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -21,16 +21,16 @@
 package org.jboss.esb.jms;
 
 import org.apache.log4j.Logger;
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.annotations.Property.Use;
-import org.jboss.esb.annotations.Uninitialize;
-import org.jboss.esb.context.InvocationContext;
-import org.jboss.esb.context.ResourceLocator;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.InboundRouter;
-import org.jboss.esb.routing.MessageDispatcher;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.annotations.Property.Use;
+import org.jboss.esb.api.annotations.Uninitialize;
+import org.jboss.esb.api.context.InvocationContext;
+import org.jboss.esb.api.context.ResourceLocator;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.MessageDispatcher;
+import org.jboss.esb.api.routing.InboundRouter;
+import org.jboss.esb.api.routing.RoutingException;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -88,7 +88,7 @@
     /**
      * JMS connection properties.
      */
-    @org.jboss.esb.annotations.Properties
+    @org.jboss.esb.api.annotations.Properties
     private final Properties jmsProperties = getDefaultProperties();
 
     /**

Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInformationExtractor.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInformationExtractor.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInformationExtractor.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -28,8 +28,8 @@
 import static org.jboss.esb.jms.JmsConstants.REDELIVERED;
 import static org.jboss.esb.jms.JmsConstants.REPLY_TO;
 import static org.jboss.esb.jms.JmsConstants.TIMESTAMP;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.RoutingException;
 
 import javax.jms.BytesMessage;
 import javax.jms.Destination;

Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInformationExtractorTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInformationExtractorTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInformationExtractorTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -42,8 +42,8 @@
 import javax.jms.Destination;
 import javax.jms.JMSException;
 
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.RoutingException;
 import org.junit.Test;
 
 import com.mockrunner.mock.jms.MockBytesMessage;

Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/MyTestService.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/MyTestService.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/MyTestService.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,9 +19,9 @@
  */
 package org.jboss.esb.jms;
 
-import org.jboss.esb.message.Message;
-import org.jboss.esb.service.Service;
-import org.jboss.esb.service.ServiceException;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.service.Service;
+import org.jboss.esb.api.service.ServiceException;
 
 /**
  * Simple Test service

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DefaultResourceLocator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DefaultResourceLocator.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DefaultResourceLocator.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -21,7 +21,7 @@
 package org.jboss.esb.deploy;
 
 import org.jboss.esb.classpath.ClassUtil;
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
 
 import java.io.InputStream;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentException.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.deploy;
 
-import org.jboss.esb.exception.JBossESBException;
+import org.jboss.esb.api.exception.JBossESBException;
 
 /**
  * ESB Deployment Exception.

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,11 +20,11 @@
 package org.jboss.esb.deploy;
 
 import org.apache.log4j.Logger;
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Uninitialize;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Uninitialize;
 import org.jboss.esb.classpath.ClassUtil;
-import org.jboss.esb.context.DeploymentContext;
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.DeploymentContext;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.jboss.esb.deploy.config.ConfigUtil;
 import org.jboss.esb.deploy.config.DeploymentUnit;
 import org.jboss.esb.deploy.config.InboundRouterConfig;
@@ -41,13 +41,13 @@
 import org.jboss.esb.federate.bus.BusInboundRouter;
 import org.jboss.esb.federate.bus.BusOutboundRouter;
 import org.jboss.esb.federate.bus.BusRoutingContext;
-import org.jboss.esb.message.MessageProcessor;
+import org.jboss.esb.api.message.MessageProcessor;
 import org.jboss.esb.properties.ApplicationProperties;
 import org.jboss.esb.properties.PropertiesIterator;
-import org.jboss.esb.routing.MessageDispatcher;
+import org.jboss.esb.api.routing.MessageDispatcher;
 import org.jboss.esb.schedule.JobScheduler;
 import org.jboss.esb.schedule.SimpleSchedule;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 
 import java.io.IOException;
@@ -142,7 +142,7 @@
     private final ResourceLocator resourceLocator;
 
     /**
-     * Constructs a DeploymentRuntime and sets its {@link org.jboss.esb.context.ResourceLocator}
+     * Constructs a DeploymentRuntime and sets its {@link org.jboss.esb.api.context.ResourceLocator}
      * to {@link DefaultResourceLocator}.
      */
     public DeploymentRuntime()

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentUtil.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentUtil.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,13 +19,13 @@
  */
 package org.jboss.esb.deploy;
 
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.jboss.esb.deploy.config.DeploymentUnit;
 import org.jboss.esb.deploy.config.InboundRouterConfig;
 import org.jboss.esb.deploy.config.OutboundRouterConfig;
 import org.jboss.esb.deploy.config.ServiceConfig;
 import org.jboss.esb.deploy.config.digest.DefaultConfigurationDigester;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 
 import java.io.IOException;
@@ -71,7 +71,7 @@
      * Uses the {@link org.jboss.esb.deploy.config.digest.DefaultConfigurationDigester}.
      *
      * @param deploymentConfig The config stream.
-     * @param resourceLocator The {@link org.jboss.esb.context.ResourceLocator} to use.
+     * @param resourceLocator The {@link org.jboss.esb.api.context.ResourceLocator} to use.
      * @return The DeploymentRuntime instance (undeployed).
      * @throws org.jboss.esb.deploy.DeploymentException
      *                             Error digesting configuration.

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ConfigUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ConfigUtil.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ConfigUtil.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,10 +19,10 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.annotations.AnnotationConstants;
-import org.jboss.esb.annotations.Property;
+import org.jboss.esb.api.annotations.AnnotationConstants;
+import org.jboss.esb.api.annotations.Property;
 import org.jboss.esb.classpath.ClassUtil;
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.util.AssertArgument;
 import org.milyn.javabean.DataDecoder;
@@ -154,8 +154,8 @@
     /**
      * Configure the supplied component with the supplied property set.
      * <p/>
-     * Configures according to the {@link org.jboss.esb.annotations.Property}
-     * and {@link org.jboss.esb.annotations.Properties} annotations.
+     * Configures according to the {@link org.jboss.esb.api.annotations.Property}
+     * and {@link org.jboss.esb.api.annotations.Properties} annotations.
      *
      * @param component The component to be configured.
      * @param properties The properties set.

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/DeploymentUnit.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/DeploymentUnit.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/DeploymentUnit.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,7 +20,7 @@
 package org.jboss.esb.deploy.config;
 
 import org.jboss.esb.deploy.DeploymentException;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 
 import java.util.ArrayList;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/FilterConfig.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/FilterConfig.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/FilterConfig.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,8 +19,8 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.routing.FilterEvaluator;
-import org.jboss.esb.message.MessageProcessor;
+import org.jboss.esb.api.routing.FilterEvaluator;
+import org.jboss.esb.api.message.MessageProcessor;
 
 import java.util.List;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,10 +19,10 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.message.MessageProcessor;
-import org.jboss.esb.routing.InboundRouter;
-import org.jboss.esb.routing.MessageDispatcher;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.message.MessageProcessor;
+import org.jboss.esb.api.routing.InboundRouter;
+import org.jboss.esb.api.routing.MessageDispatcher;
+import org.jboss.esb.api.service.ServiceName;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -132,7 +132,7 @@
     }
 
     /**
-     * Get the {@link MessageDispatcher} associated with this router config.
+     * Get the {@link org.jboss.esb.api.routing.MessageDispatcher} associated with this router config.
      *
      * @param dispatcher The DispatcherProxy instance.
      */

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterFilterConfig.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterFilterConfig.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterFilterConfig.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * Inbound router filter configuration.

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,9 +19,9 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.message.MessageProcessor;
-import org.jboss.esb.routing.OutboundRouter;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.message.MessageProcessor;
+import org.jboss.esb.api.routing.OutboundRouter;
+import org.jboss.esb.api.service.ServiceName;
 
 import java.util.List;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/PropertiesUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/PropertiesUtil.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/PropertiesUtil.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.properties.ApplicationProperties;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ServiceConfig.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ServiceConfig.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ServiceConfig.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,9 +19,9 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.service.Service;
-import org.jboss.esb.service.ServiceName;
-import org.jboss.esb.service.ServiceMEP;
+import org.jboss.esb.api.service.Service;
+import org.jboss.esb.api.service.ServiceName;
+import org.jboss.esb.api.service.ServiceMEP;
 
 /**
  * Service Deployment Configuration.

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/CreateObject.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/CreateObject.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/CreateObject.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,17 +19,17 @@
  */
 package org.jboss.esb.deploy.config.digest;
 
-import static org.jboss.esb.annotations.AnnotationConstants.UNASSIGNED;
+import static org.jboss.esb.api.annotations.AnnotationConstants.UNASSIGNED;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.annotations.Property.Use;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.annotations.Property.Use;
 import org.jboss.esb.classpath.ClassUtil;
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.milyn.SmooksException;
 import org.milyn.cdr.SmooksConfigurationException;
 import org.milyn.cdr.annotation.ConfigParam;
@@ -163,7 +163,7 @@
      * Create the specified object and check it's type.
      * @param objectClassName The object class name.
      * @param expectedType The expected type.
-     * @param resourceLocator The {@link org.jboss.esb.context.ResourceLocator} to use.
+     * @param resourceLocator The {@link org.jboss.esb.api.context.ResourceLocator} to use.
      * @return Object The created object.
      * @throws SmooksException if an exception occurs while trying to create the object.
      */

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.deploy.config.digest;
 
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.DeploymentResource;
 import org.jboss.esb.deploy.config.DeploymentUnit;
@@ -27,7 +27,7 @@
 import org.jboss.esb.deploy.config.InboundRouterFilterConfig;
 import org.jboss.esb.deploy.config.OutboundRouterConfig;
 import org.jboss.esb.deploy.config.ServiceConfig;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 import org.jboss.esb.util.XsdDOMValidator;
 import org.jboss.esb.xml.XMLParseUtils;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.deploy.config.digest;
 
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.jboss.esb.xml.XMLParseUtils;
 import org.milyn.Smooks;
 import org.milyn.cdr.SmooksResourceConfigurationList;
@@ -78,7 +78,7 @@
      * The caller needs to sort out and validate the returned list.
      *
      * @param configurationElement The configuration element.
-     * @param resourceLocator The {@link org.jboss.esb.context.ResourceLocator} to use.
+     * @param resourceLocator The {@link org.jboss.esb.api.context.ResourceLocator} to use.
      * @return List of configuration "objects".  Returns an empty
      *         list if there are no child elements.
      * @throws IOException  Error reading digests configuration.
@@ -97,7 +97,7 @@
      *
      * @param configurationElement The configuration element.
      * @param matchElementName     The name of the elements to be digested.  <code>null</code> to digest all elements.
-     * @param resourceLocator The {@link org.jboss.esb.context.ResourceLocator} to use.
+     * @param resourceLocator The {@link org.jboss.esb.api.context.ResourceLocator} to use.
      * @return List of configuration "objects".  Returns an empty
      *         list if there are no child elements.
      * @throws IOException  Error reading digests configuration.
@@ -181,7 +181,7 @@
      * Get the Smooks instance for the supplied namespaced element.
      *
      * @param element The namespaced element.
-     * @param resourceLocator The {@link org.jboss.esb.context.ResourceLocator} to use.
+     * @param resourceLocator The {@link org.jboss.esb.api.context.ResourceLocator} to use.
      * @return The Smooks instance for the element namespace, otherwise null.
      * @throws IOException  Error reading digests configuration.
      * @throws SAXException Error parsing digest configuration.
@@ -225,7 +225,7 @@
      * Get the namespace configuration for the specified namespace URI.
      *
      * @param namespace The namespace URI.
-     * @param resourceLocator The {@link org.jboss.esb.context.ResourceLocator} to use.
+     * @param resourceLocator The {@link org.jboss.esb.api.context.ResourceLocator} to use.
      * @return The SmooksResourceConfigurationList instance.
      * @throws IOException  Error reading digests configuration.
      * @throws SAXException Error parsing digest configuration.

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/FilterDecisionTreeBuilder.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/FilterDecisionTreeBuilder.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/FilterDecisionTreeBuilder.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,11 +19,11 @@
  */
 package org.jboss.esb.deploy.config.digest;
 
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
+import org.jboss.esb.api.routing.FilterEvaluator;
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.config.ConfigUtil;
 import org.jboss.esb.filter.FilterDecisionNode;
-import org.jboss.esb.routing.FilterEvaluator;
 import org.milyn.SmooksException;
 import org.milyn.cdr.annotation.ConfigParam;
 import org.milyn.container.ExecutionContext;
@@ -105,7 +105,7 @@
     /**
      * Create the evaluator instance from the configuration element.
      * @param element The element.
-     * @param resourceLocator The {@link org.jboss.esb.context.ResourceLocator} to use.
+     * @param resourceLocator The {@link org.jboss.esb.api.context.ResourceLocator} to use.
      * @return The FilterEvaluator instance.
      * @throws SmooksException Error creating {@link FilterEvaluator}.
      */

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/SetProperty.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/SetProperty.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/SetProperty.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,8 +19,8 @@
  */
 package org.jboss.esb.deploy.config.digest;
 
-import org.jboss.esb.annotations.AnnotationConstants;
-import org.jboss.esb.annotations.Property;
+import org.jboss.esb.api.annotations.AnnotationConstants;
+import org.jboss.esb.api.annotations.Property;
 import org.jboss.esb.classpath.ClassUtil;
 import org.milyn.SmooksException;
 import org.milyn.cdr.annotation.ConfigParam;
@@ -181,7 +181,7 @@
 
         for (Field field : clazz.getDeclaredFields())
         {
-            org.jboss.esb.annotations.Properties propertiesAnno = field.getAnnotation(org.jboss.esb.annotations.Properties.class);
+            org.jboss.esb.api.annotations.Properties propertiesAnno = field.getAnnotation(org.jboss.esb.api.annotations.Properties.class);
             if (propertiesAnno != null)
             {
                 attemptPropertiesFieldSet(instance, field, configPropertyName, value);

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/AbstractDispatcher.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/AbstractDispatcher.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/AbstractDispatcher.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,10 +20,10 @@
 package org.jboss.esb.dispatch;
 
 import org.apache.log4j.Logger;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.DeploymentContext;
-import org.jboss.esb.context.FaultContext;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.DeploymentContext;
+import org.jboss.esb.api.context.FaultContext;
+import org.jboss.esb.api.context.InvocationContext;
 import org.jboss.esb.deploy.config.FilterConfig;
 import org.jboss.esb.deploy.config.OutboundRouterConfig;
 import org.jboss.esb.deploy.config.ServiceConfig;
@@ -33,18 +33,18 @@
 import org.jboss.esb.history.ProcessingEventLog;
 import org.jboss.esb.history.events.OutboundRouterProcessingEvent;
 import org.jboss.esb.history.events.ServiceProcessingEvent;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.message.MessageProcessor;
-import org.jboss.esb.routing.FilterEvaluator;
-import org.jboss.esb.routing.MessageDispatcher;
-import org.jboss.esb.routing.OutboundRouter;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.message.MessageProcessor;
+import org.jboss.esb.api.routing.FilterEvaluator;
+import org.jboss.esb.api.routing.MessageDispatcher;
+import org.jboss.esb.api.routing.OutboundRouter;
+import org.jboss.esb.api.routing.RoutingException;
 import org.jboss.esb.invoke.ServiceInvoker;
 import org.jboss.esb.serialization.SerializationException;
 import org.jboss.esb.serialization.java.JavaSerializer;
-import org.jboss.esb.service.ServiceException;
-import org.jboss.esb.service.ServiceMEP;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceException;
+import org.jboss.esb.api.service.ServiceMEP;
+import org.jboss.esb.api.service.ServiceName;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -140,7 +140,7 @@
      * Is the dispatcher instance processing messages.
      * <p/>
      * This is required by the undeploy process.  After uninitializing
-     * all {@link org.jboss.esb.routing.InboundRouter} instances, the undeploy waits untill
+     * all {@link org.jboss.esb.api.routing.InboundRouter} instances, the undeploy waits untill
      * all dispatchers have completed processing all their messages before
      * continuing with the undeploy (uninitializing all other components
      * and resources).
@@ -158,7 +158,7 @@
      *
      * @param message    The message.
      * @param processorList The processors to be applied.
-     * @throws org.jboss.esb.routing.RoutingException
+     * @throws org.jboss.esb.api.routing.RoutingException
      *          Error applying processor.
      */
     protected final void applyProcessors(final Message message, final List<MessageProcessor> processorList) throws RoutingException
@@ -395,7 +395,7 @@
      *
      * @param outMessage         The message.
      * @param outboundProcessors The processors to be applied.
-     * @throws org.jboss.esb.routing.RoutingException
+     * @throws org.jboss.esb.api.routing.RoutingException
      *          Error applying processor.
      */
     private void applyOutboundProcessors(final Message outMessage, final List<MessageProcessor> outboundProcessors) throws RoutingException

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/DispatchChain.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/DispatchChain.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/DispatchChain.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -21,7 +21,7 @@
 
 import org.jboss.esb.deploy.config.OutboundRouterConfig;
 import org.jboss.esb.deploy.config.ServiceConfig;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 
 import java.util.List;
@@ -30,7 +30,7 @@
  * Message Dispatch Chain.
  * <p/>
  * Messages are dispatched (from an InboundRouter) to a Service instance and then out through
- * a set of one or more {@link org.jboss.esb.routing.OutboundRouter outbound routers}.  A
+ * a set of one or more {@link org.jboss.esb.api.routing.OutboundRouter outbound routers}.  A
  * Dispatch Chain manages the associations between the Service instance and the outbound routers.
  *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,16 +20,16 @@
 package org.jboss.esb.dispatch;
 
 import org.apache.log4j.Logger;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.DeploymentContext;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.DeploymentContext;
+import org.jboss.esb.api.context.InvocationContext;
 import org.jboss.esb.deploy.config.InboundRouterFilterConfig;
 import org.jboss.esb.deploy.config.FilterConfig;
 import org.jboss.esb.history.ProcessingEventLog;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.message.MessageProcessor;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.message.MessageProcessor;
 import org.jboss.esb.util.AssertArgument;
-import org.jboss.esb.routing.FilterEvaluator;
+import org.jboss.esb.api.routing.FilterEvaluator;
 
 import java.util.List;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/failure/DeadLetterPersistanceService.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/failure/DeadLetterPersistanceService.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/failure/DeadLetterPersistanceService.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,10 +19,10 @@
  */
 package org.jboss.esb.failure;
 
-import org.jboss.esb.message.Message;
-import org.jboss.esb.service.Service;
-import org.jboss.esb.service.ServiceException;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.service.Service;
+import org.jboss.esb.api.service.ServiceException;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/failure/MockDeadLetterService.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/failure/MockDeadLetterService.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/failure/MockDeadLetterService.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,11 +19,11 @@
  */
 package org.jboss.esb.failure;
 
-import org.jboss.esb.message.Message;
+import org.jboss.esb.api.message.Message;
 import org.jboss.esb.schedule.AbstractScheduleListener;
 import org.jboss.esb.schedule.SchedulingException;
-import org.jboss.esb.service.Service;
-import org.jboss.esb.service.ServiceException;
+import org.jboss.esb.api.service.Service;
+import org.jboss.esb.api.service.ServiceException;
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,10 +20,10 @@
 package org.jboss.esb.federate;
 
 import org.apache.log4j.Logger;
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Uninitialize;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.DeploymentContext;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Uninitialize;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.DeploymentContext;
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.config.PropertiesUtil;
@@ -40,10 +40,10 @@
 import org.jboss.esb.federate.notify.NotificationListener;
 import org.jboss.esb.properties.ApplicationProperties;
 import org.jboss.esb.properties.PropertiesIterator;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.routing.RoutingException;
 import org.jboss.esb.schedule.AbstractScheduleListener;
 import org.jboss.esb.schedule.SchedulingException;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 
 import java.util.ArrayList;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentMonitor.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentMonitor.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentMonitor.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,17 +19,17 @@
  */
 package org.jboss.esb.federate;
 
-import org.jboss.esb.context.DeploymentContext;
-import org.jboss.esb.context.FaultContext;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.context.DeploymentContext;
+import org.jboss.esb.api.context.FaultContext;
+import org.jboss.esb.api.context.InvocationContext;
 import org.jboss.esb.failure.DeadLetterPersistanceService;
 import org.jboss.esb.federate.bus.Bus;
 import org.jboss.esb.federate.bus.BusMessage;
 import org.jboss.esb.history.ProcessingEventLog;
 import org.jboss.esb.history.events.BusRouterProcessingEvent;
-import org.jboss.esb.message.Message;
+import org.jboss.esb.api.message.Message;
 import org.jboss.esb.invoke.ServiceInvoker;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 
 /**
@@ -146,11 +146,11 @@
     }
 
     /**
-     * Does the target deployment have any {@link org.jboss.esb.routing.OutboundRouter}
+     * Does the target deployment have any {@link org.jboss.esb.api.routing.OutboundRouter}
      * instances for the specified service.
      *
      * @param serviceName The Service name.
-     * @return True if the target deployment has any {@link org.jboss.esb.routing.OutboundRouter}
+     * @return True if the target deployment has any {@link org.jboss.esb.api.routing.OutboundRouter}
      *         instances for the specified service, otherwise false.
      */
     public final boolean hasServiceRouter(final ServiceName serviceName)

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentServiceSets.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentServiceSets.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentServiceSets.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.federate;
 
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 import java.io.Serializable;
 import java.util.LinkedHashSet;
@@ -31,7 +31,7 @@
  * The Services for which a Deployment defines the following:
  * <ul>
  * <li>A Service.</li>
- * <li>One or more {@link org.jboss.esb.routing.OutboundRouter OutboundRouters}.</li>
+ * <li>One or more {@link org.jboss.esb.api.routing.OutboundRouter OutboundRouters}.</li>
  * </ul>
  *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/Bus.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/Bus.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/Bus.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -24,7 +24,7 @@
 import org.jboss.esb.federate.notify.AbstractDeploymentNotification;
 import org.jboss.esb.federate.notify.NotificationListener;
 import org.jboss.esb.properties.ApplicationProperties;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.routing.RoutingException;
 
 /**
  * JBoss ESB Bus definition.

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusDispatcher.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusDispatcher.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusDispatcher.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,13 +19,13 @@
  */
 package org.jboss.esb.federate.bus;
 
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.DeploymentContext;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.DeploymentContext;
+import org.jboss.esb.api.context.InvocationContext;
 import org.jboss.esb.dispatch.AbstractDispatcher;
 import org.jboss.esb.dispatch.DispatchChain;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusInboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusInboundRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusInboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,13 +19,13 @@
  */
 package org.jboss.esb.federate.bus;
 
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.InvocationContext;
 import org.jboss.esb.history.ProcessingEventLog;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.InboundRouter;
-import org.jboss.esb.routing.MessageDispatcher;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.MessageDispatcher;
+import org.jboss.esb.api.routing.InboundRouter;
+import org.jboss.esb.api.routing.RoutingException;
 
 /**
  * Bus inbound router for a specific Service.
@@ -55,7 +55,7 @@
     /**
      * Set the {@link MessageDispatcher} for the router.
      *
-     * @param dispatcher The {@link MessageDispatcher} instance.
+     * @param dispatcher The {@link org.jboss.esb.api.routing.MessageDispatcher} instance.
      */
     public final void setDispatcher(final MessageDispatcher dispatcher)
     {

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusMessage.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusMessage.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusMessage.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,10 +19,10 @@
  */
 package org.jboss.esb.federate.bus;
 
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.InvocationContext;
 import org.jboss.esb.history.ProcessingEventLog;
-import org.jboss.esb.message.Message;
+import org.jboss.esb.api.message.Message;
 
 import java.io.Serializable;
 import java.util.LinkedHashMap;
@@ -31,7 +31,7 @@
 /**
  * ESB Bus Message.
  * <p/>
- * This class encapsulates the ESB {@link org.jboss.esb.message.Message} for transportation
+ * This class encapsulates the ESB {@link org.jboss.esb.api.message.Message} for transportation
  * on a Bus.
  *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
@@ -68,7 +68,7 @@
      * Get the invocation parameters provided with the initial
      * service invocation.
      * <p/>
-     * These parameters pass along with the {@link org.jboss.esb.message.Message}
+     * These parameters pass along with the {@link org.jboss.esb.api.message.Message}
      *
      * @return The invocation parameters.
      */
@@ -81,7 +81,7 @@
      * Set the invocation parameters provided with the initial
      * service invocation.
      * <p/>
-     * These parameters pass along with the {@link org.jboss.esb.message.Message}
+     * These parameters pass along with the {@link org.jboss.esb.api.message.Message}
      *
      * @param invocationParameters The invocation parameters.
      */

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusMessageListener.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusMessageListener.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusMessageListener.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.federate.bus;
 
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.routing.RoutingException;
 
 /**
  * {@link BusMessage} Listener interface.

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusOutboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusOutboundRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusOutboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,13 +19,13 @@
  */
 package org.jboss.esb.federate.bus;
 
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.InvocationContext;
 import org.jboss.esb.federate.DeploymentMonitor;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.OutboundRouter;
-import org.jboss.esb.routing.RoutingException;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.OutboundRouter;
+import org.jboss.esb.api.routing.RoutingException;
+import org.jboss.esb.api.service.ServiceName;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -66,7 +66,7 @@
      * Route the message.
      *
      * @param message The message to be routed.
-     * @throws RoutingException An exception occured while routing the message.
+     * @throws org.jboss.esb.api.routing.RoutingException An exception occured while routing the message.
      */
     public final void route(final Message message) throws RoutingException
     {
@@ -154,7 +154,7 @@
      *
      * @param busMessage The message to route.
      * @return True if the message was successfully routed, otherwise false.
-     * @throws RoutingException Bus exception during routing operation.
+     * @throws org.jboss.esb.api.routing.RoutingException Bus exception during routing operation.
      */
     private boolean routeToService(final BusMessage busMessage) throws RoutingException
     {

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusRoutingContext.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusRoutingContext.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusRoutingContext.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,9 +19,9 @@
  */
 package org.jboss.esb.federate.bus;
 
-import org.jboss.esb.context.DeploymentContext;
+import org.jboss.esb.api.context.DeploymentContext;
 import org.jboss.esb.deploy.DeploymentRuntime;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 
 import java.util.HashMap;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,8 +20,8 @@
 package org.jboss.esb.federate.bus.jms;
 
 import org.apache.log4j.Logger;
-import org.jboss.esb.context.ResourceLocator;
-import org.jboss.esb.context.DeploymentContext;
+import org.jboss.esb.api.context.ResourceLocator;
+import org.jboss.esb.api.context.DeploymentContext;
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.federate.bus.Bus;
@@ -34,7 +34,7 @@
 import org.jboss.esb.jms.JMSSession;
 import org.jboss.esb.jms.MessageSender;
 import org.jboss.esb.properties.ApplicationProperties;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.routing.RoutingException;
 
 import javax.jms.JMSException;
 import javax.jms.ObjectMessage;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/filter/FilterDecisionNode.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/filter/FilterDecisionNode.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/filter/FilterDecisionNode.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,8 +19,8 @@
  */
 package org.jboss.esb.filter;
 
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.FilterEvaluator;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.FilterEvaluator;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/filter/MVELEvaluator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/filter/MVELEvaluator.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/filter/MVELEvaluator.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,19 +20,19 @@
 package org.jboss.esb.filter;
 
 import org.apache.log4j.Logger;
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.DeploymentContext;
-import org.jboss.esb.context.InvocationContext;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.FilterEvaluator;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.DeploymentContext;
+import org.jboss.esb.api.context.InvocationContext;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.FilterEvaluator;
 import org.milyn.expression.MVELExpressionEvaluator;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * MVEL {@link org.jboss.esb.routing.FilterEvaluator}.
+ * MVEL {@link org.jboss.esb.api.routing.FilterEvaluator}.
  * <p/>
  * Available expression context objects:
  * <ul>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/ProcessingEvent.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/ProcessingEvent.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/ProcessingEvent.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.history;
 
-import org.jboss.esb.context.DeploymentContext;
+import org.jboss.esb.api.context.DeploymentContext;
 import org.jboss.esb.deploy.DeploymentRuntime;
 
 import java.io.Serializable;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/ProcessingEventLog.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/ProcessingEventLog.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/ProcessingEventLog.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,8 +19,8 @@
  */
 package org.jboss.esb.history;
 
-import org.jboss.esb.context.DeploymentContext;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.context.DeploymentContext;
+import org.jboss.esb.api.context.InvocationContext;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.util.AssertArgument;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/events/BusRouterProcessingEvent.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/events/BusRouterProcessingEvent.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/events/BusRouterProcessingEvent.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.history.events;
 
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.federate.bus.Bus;
 import org.jboss.esb.history.ProcessingEvent;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/events/ServiceProcessingEvent.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/events/ServiceProcessingEvent.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/history/events/ServiceProcessingEvent.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,7 +20,7 @@
 package org.jboss.esb.history.events;
 
 import org.jboss.esb.history.ProcessingEvent;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * Service processing event.

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/invoke/ServiceInvoker.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/invoke/ServiceInvoker.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/invoke/ServiceInvoker.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,9 +20,9 @@
 package org.jboss.esb.invoke;
 
 import org.apache.log4j.Logger;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.DeploymentContext;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.DeploymentContext;
+import org.jboss.esb.api.context.InvocationContext;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
 import org.jboss.esb.deploy.config.ServiceConfig;
@@ -31,8 +31,8 @@
 import org.jboss.esb.federate.bus.BusInboundRouter;
 import org.jboss.esb.federate.bus.BusMessage;
 import org.jboss.esb.federate.bus.BusRoutingContext;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 import org.jboss.esb.history.ProcessingEventLog;
 import org.jboss.esb.serialization.java.JavaSerializer;
@@ -130,7 +130,7 @@
     /**
      * Route the message to a local Service.
      * @param message The message.
-     * @param dispatchAddressingContext The {@link org.jboss.esb.context.AddressingContext} for the dispatch.
+     * @param dispatchAddressingContext The {@link org.jboss.esb.api.context.AddressingContext} for the dispatch.
      * @return true If the routing succeeded.
      */
     private boolean routeLocal(final Message message, final AddressingContext dispatchAddressingContext)

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/invoke/ServiceRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/invoke/ServiceRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/invoke/ServiceRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,18 +19,18 @@
  */
 package org.jboss.esb.invoke;
 
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.DeploymentContext;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.DeploymentContext;
 import org.jboss.esb.deploy.DeploymentException;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.service.ServiceName;
-import org.jboss.esb.routing.OutboundRouter;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.service.ServiceName;
+import org.jboss.esb.api.routing.OutboundRouter;
+import org.jboss.esb.api.routing.RoutingException;
 
 /**
- * Service Message {@link org.jboss.esb.routing.OutboundRouter}.
+ * Service Message {@link org.jboss.esb.api.routing.OutboundRouter}.
  * <p/>
  * Allows routing of an ESB message to another Service instance.
  *
@@ -117,7 +117,7 @@
      * Route the message.
      *
      * @param message The message to be routed.
-     * @throws org.jboss.esb.routing.RoutingException An exception occured while routing the message.
+     * @throws org.jboss.esb.api.routing.RoutingException An exception occured while routing the message.
      */
     public final void route(final Message message) throws RoutingException
     {

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/AbstractScheduleListener.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/AbstractScheduleListener.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/AbstractScheduleListener.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,9 +19,9 @@
  */
 package org.jboss.esb.schedule;
 
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.context.DeploymentContext;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.context.DeploymentContext;
 import org.jboss.esb.deploy.AssertDeployment;
 
 /**
@@ -30,7 +30,7 @@
  * This abstract implementation registers the listener implementation with the
  * {@link JobScheduler} associated with the deployment context.  The schedule
  * instance is looked up based on the config property named "scheduleResourceId".
- * See {@link JobScheduler#addScheduleListener(ScheduleListener, String, String, org.jboss.esb.context.DeploymentContext)}.
+ * See {@link JobScheduler#addScheduleListener(ScheduleListener, String, String, org.jboss.esb.api.context.DeploymentContext)}.
  *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/CronSchedule.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/CronSchedule.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/CronSchedule.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.schedule;
 
-import org.jboss.esb.annotations.Property;
+import org.jboss.esb.api.annotations.Property;
 import org.quartz.CronTrigger;
 import org.quartz.Trigger;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/JobScheduler.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/JobScheduler.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/JobScheduler.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,10 +19,10 @@
  */
 package org.jboss.esb.schedule;
 
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Uninitialize;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Uninitialize;
 import org.jboss.esb.classpath.ClassUtil;
-import org.jboss.esb.context.DeploymentContext;
+import org.jboss.esb.api.context.DeploymentContext;
 import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/Schedule.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/Schedule.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/Schedule.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.schedule;
 
-import org.jboss.esb.annotations.Initialize;
+import org.jboss.esb.api.annotations.Initialize;
 import org.quartz.Trigger;
 
 import java.util.Calendar;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SchedulingException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SchedulingException.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SchedulingException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.schedule;
 
-import org.jboss.esb.exception.JBossESBException;
+import org.jboss.esb.api.exception.JBossESBException;
 
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SimpleSchedule.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SimpleSchedule.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SimpleSchedule.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.schedule;
 
-import org.jboss.esb.annotations.Property;
+import org.jboss.esb.api.annotations.Property;
 import org.quartz.SimpleTrigger;
 import org.quartz.Trigger;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/SerializationException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/SerializationException.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/SerializationException.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.serialization;
 
-import org.jboss.esb.exception.JBossESBException;
+import org.jboss.esb.api.exception.JBossESBException;
 
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/Serializer.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/Serializer.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/Serializer.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.serialization;
 
-import org.jboss.esb.message.Message;
+import org.jboss.esb.api.message.Message;
 
 import java.io.InputStream;
 import java.io.OutputStream;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/java/JavaSerializer.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/java/JavaSerializer.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/serialization/java/JavaSerializer.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,7 +20,7 @@
 package org.jboss.esb.serialization.java;
 
 import org.jboss.esb.classpath.ContextObjectInputStream;
-import org.jboss.esb.message.Message;
+import org.jboss.esb.api.message.Message;
 import org.jboss.esb.serialization.SerializationException;
 import org.jboss.esb.serialization.Serializer;
 import org.jboss.esb.util.AssertArgument;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JBossESBTestCase.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JBossESBTestCase.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JBossESBTestCase.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -79,8 +79,8 @@
  *
  *         // Get a handle on the test inrouter and outrouter components from
  *         // the DeploymentRuntime instances that host them...
- *         TestInRouter inrouterA = (TestInRouter) {@link org.jboss.esb.routing.InboundRouter DeploymentUtil.getInboundRouter}(serviceA, "inrouterA", deployment1).getRouter();
- *         TestOutRouter outrouterF = (TestOutRouter) {@link org.jboss.esb.routing.OutboundRouter DeploymentUtil.getOutboundRouter}(serviceF, "outrouterF", deployment3).getRouter();
+ *         TestInRouter inrouterA = (TestInRouter) {@link org.jboss.esb.api.routing.InboundRouter DeploymentUtil.getInboundRouter}(serviceA, "inrouterA", deployment1).getRouter();
+ *         TestOutRouter outrouterF = (TestOutRouter) {@link org.jboss.esb.api.routing.OutboundRouter DeploymentUtil.getOutboundRouter}(serviceF, "outrouterF", deployment3).getRouter();
  *
  *         // Send a message in through the test inrouter and wait for it to
  *         // be routed to the test outrouter (timeout after 10 seconds)...

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/util/XsdDOMValidator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/util/XsdDOMValidator.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/util/XsdDOMValidator.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,7 +19,7 @@
  */
 package org.jboss.esb.util;
 
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.jboss.esb.xml.XMLParseUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -120,7 +120,7 @@
     /**
      * Validate the document against the namespaces referenced in it.
      *
-     * @param resourceLocator The {@link org.jboss.esb.context.ResourceLocator} to use.
+     * @param resourceLocator The {@link org.jboss.esb.api.context.ResourceLocator} to use.
      * @throws SAXException        Validation error.
      * @throws java.io.IOException Error reading the XSD Sources.
      */

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/inrouters-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/inrouters-smooks.xml	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/inrouters-smooks.xml	2008-10-16 13:23:19 UTC (rev 23475)
@@ -22,7 +22,7 @@
         <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
         <param name="beanId">inRouter</param> <!-- Wired in above. -->
         <param name="classAttrib">class</param>
-        <param name="expectedType">org.jboss.esb.routing.InboundRouter</param>
+        <param name="expectedType">org.jboss.esb.api.routing.InboundRouter</param>
     </resource-config>
 
     <resource-config selector="inRouter/property">

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/outrouters-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/outrouters-smooks.xml	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/outrouters-smooks.xml	2008-10-16 13:23:19 UTC (rev 23475)
@@ -31,7 +31,7 @@
         <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
         <param name="beanId">outRouter</param> <!-- Wired in above. -->
         <param name="classAttrib">class</param>
-        <param name="expectedType">org.jboss.esb.routing.OutboundRouter</param>
+        <param name="expectedType">org.jboss.esb.api.routing.OutboundRouter</param>
     </resource-config>
 
     <resource-config selector="outRouter/property">

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/processors-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/processors-smooks.xml	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/processors-smooks.xml	2008-10-16 13:23:19 UTC (rev 23475)
@@ -12,7 +12,7 @@
         <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
         <param name="beanId">@beanId at -entry</param> <!-- Wired in above. -->
         <param name="classAttrib">class</param>
-        <param name="expectedType">org.jboss.esb.message.MessageProcessor</param>
+        <param name="expectedType">org.jboss.esb.api.message.MessageProcessor</param>
     </resource-config>
 
     <resource-config selector="@selectorContext@/processor/property">

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/servicename-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/servicename-smooks.xml	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/servicename-smooks.xml	2008-10-16 13:23:19 UTC (rev 23475)
@@ -7,7 +7,7 @@
     <resource-config selector="@selectorContext@">
         <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
         <param name="beanId">@beanId@</param>
-        <param name="className">org.jboss.esb.service.ServiceName</param>
+        <param name="className">org.jboss.esb.api.service.ServiceName</param>
     </resource-config>
 
     <resource-config selector="@selectorContext@">

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/services-smooks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/services-smooks.xml	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/xsd/smooks/services-smooks.xml	2008-10-16 13:23:19 UTC (rev 23475)
@@ -27,7 +27,7 @@
         <jb:wiring property="serviceName" beanIdRef="serviceName" />
         <jb:value property="description" data="service/@serviceDescription" />
         <jb:value property="serviceMEP" data="service/@mep" decoder="Enum" default="In-Only">
-            <jb:decodeParam name="enumType">org.jboss.esb.service.ServiceMEP</jb:decodeParam>
+            <jb:decodeParam name="enumType">org.jboss.esb.api.service.ServiceMEP</jb:decodeParam>
             <jb:decodeParam name="In-Only">InOnly</jb:decodeParam>
             <jb:decodeParam name="Out-Only">OutOnly</jb:decodeParam>
             <jb:decodeParam name="In-Out">InOut</jb:decodeParam>
@@ -43,7 +43,7 @@
         <resource>org.jboss.esb.deploy.config.digest.CreateObject</resource>
         <param name="beanId">serviceInstance</param> <!-- Wired in above. -->
         <param name="classAttrib">class</param>
-        <param name="expectedType">org.jboss.esb.service.Service</param>
+        <param name="expectedType">org.jboss.esb.api.service.Service</param>
     </resource-config>
 
     <resource-config selector="service/property">

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/ESBTestComponent.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/ESBTestComponent.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/ESBTestComponent.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -21,12 +21,12 @@
 
 import junit.framework.TestCase;
 import org.jboss.esb.history.ProcessingEventLog;
-import org.jboss.esb.context.InvocationContext;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.DeploymentContext;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.service.ServiceException;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.context.InvocationContext;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.DeploymentContext;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.service.ServiceException;
+import org.jboss.esb.api.routing.RoutingException;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestInboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestInboundRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestInboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,11 +19,11 @@
  */
 package org.jboss.esb;
 
-import org.jboss.esb.context.InvocationContext;
-import org.jboss.esb.message.Message;
+import org.jboss.esb.api.context.InvocationContext;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.MessageDispatcher;
 import org.jboss.esb.history.ProcessingEventLog;
-import org.jboss.esb.routing.InboundRouter;
-import org.jboss.esb.routing.MessageDispatcher;
+import org.jboss.esb.api.routing.InboundRouter;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestOutboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestOutboundRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestOutboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,10 +20,10 @@
 package org.jboss.esb;
 
 import junit.framework.TestCase;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.OutboundRouter;
-import org.jboss.esb.routing.RoutingException;
-import org.jboss.esb.service.ServiceException;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.OutboundRouter;
+import org.jboss.esb.api.routing.RoutingException;
+import org.jboss.esb.api.service.ServiceException;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestService.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestService.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestService.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,10 +19,10 @@
  */
 package org.jboss.esb;
 
-import org.jboss.esb.message.Message;
-import org.jboss.esb.service.Service;
-import org.jboss.esb.service.ServiceException;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.service.Service;
+import org.jboss.esb.api.service.ServiceException;
+import org.jboss.esb.api.routing.RoutingException;
 import junit.framework.TestCase;
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestTransformer.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestTransformer.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/TestTransformer.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,11 +20,11 @@
 package org.jboss.esb;
 
 import junit.framework.TestCase;
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.message.MessageProcessingException;
-import org.jboss.esb.message.MessageProcessor;
-import org.jboss.esb.routing.RoutingException;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.message.MessageProcessingException;
+import org.jboss.esb.api.message.MessageProcessor;
+import org.jboss.esb.api.routing.RoutingException;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedResource.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedResource.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedResource.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,8 +19,8 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.annotations.Property.Use;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.annotations.Property.Use;
 
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedTestPropertiesResource.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedTestPropertiesResource.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedTestPropertiesResource.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -21,8 +21,8 @@
 
 import java.util.Properties;
 
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.annotations.Property.Use;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.annotations.Property.Use;
 
 /**
  * Simple pojo which uses properties annotations.
@@ -35,7 +35,7 @@
     @Property ( use = Use.REQUIRED, name = "userName" )
     private String name;
 
-    @org.jboss.esb.annotations.Properties
+    @org.jboss.esb.api.annotations.Properties
     private Properties props;
 
     public String getName()

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedTestPropertiesResource2.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedTestPropertiesResource2.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/AnnotatedTestPropertiesResource2.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -21,8 +21,8 @@
 
 import java.util.Properties;
 
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.annotations.Property.Use;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.annotations.Property.Use;
 
 /**
  * Simple pojo which uses properties annotations.
@@ -35,7 +35,7 @@
     @Property ( use = Use.REQUIRED, name = "userName" )
     private String name;
 
-    @org.jboss.esb.annotations.Properties
+    @org.jboss.esb.api.annotations.Properties
     private Properties properties;
 
     public Properties getProperties()

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DefaultConfigurationDigesterTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -23,9 +23,9 @@
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.config.digest.DefaultConfigurationDigester;
 import org.jboss.esb.deploy.config.digest.DigestUtil;
-import org.jboss.esb.message.MessageProcessor;
-import org.jboss.esb.service.ServiceName;
-import org.jboss.esb.service.ServiceMEP;
+import org.jboss.esb.api.message.MessageProcessor;
+import org.jboss.esb.api.service.ServiceName;
+import org.jboss.esb.api.service.ServiceMEP;
 import org.junit.After;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/InboundFilterConfigTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/InboundFilterConfigTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/InboundFilterConfigTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -23,9 +23,9 @@
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.DefaultResourceLocator;
 import org.jboss.esb.deploy.config.digest.DefaultConfigurationDigester;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.FilterEvaluator;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.FilterEvaluator;
+import org.jboss.esb.api.context.InvocationContext;
 
 import java.io.IOException;
 import java.util.List;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyInRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyInRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyInRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,13 +19,13 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.routing.InboundRouter;
-import org.jboss.esb.routing.MessageDispatcher;
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.annotations.Uninitialize;
-import org.jboss.esb.annotations.Property.Use;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.routing.InboundRouter;
+import org.jboss.esb.api.routing.MessageDispatcher;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.annotations.Uninitialize;
+import org.jboss.esb.api.annotations.Property.Use;
+import org.jboss.esb.api.service.ServiceName;
 import junit.framework.TestCase;
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyMessageTransformer.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyMessageTransformer.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyMessageTransformer.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,15 +19,15 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.message.MessageProcessor;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.message.MessageProcessingException;
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.annotations.Uninitialize;
-import org.jboss.esb.annotations.Property.Use;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.message.MessageProcessor;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.message.MessageProcessingException;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.annotations.Uninitialize;
+import org.jboss.esb.api.annotations.Property.Use;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.service.ServiceName;
 import junit.framework.TestCase;
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyOutRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyOutRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyOutRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -21,15 +21,15 @@
 
 import junit.framework.TestCase;
 
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.annotations.Uninitialize;
-import org.jboss.esb.annotations.Property.Use;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.OutboundRouter;
-import org.jboss.esb.routing.RoutingException;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.annotations.Uninitialize;
+import org.jboss.esb.api.annotations.Property.Use;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.OutboundRouter;
+import org.jboss.esb.api.routing.RoutingException;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyResource.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyResource.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyResource.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,9 +19,9 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Uninitialize;
-import org.jboss.esb.context.DeploymentContext;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Uninitialize;
+import org.jboss.esb.api.context.DeploymentContext;
 import junit.framework.TestCase;
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyTestService.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyTestService.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/MyTestService.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,15 +19,15 @@
  */
 package org.jboss.esb.deploy.config;
 
-import org.jboss.esb.service.Service;
-import org.jboss.esb.service.ServiceException;
-import org.jboss.esb.service.ServiceName;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.annotations.Uninitialize;
-import org.jboss.esb.annotations.Property.Use;
-import org.jboss.esb.context.AddressingContext;
+import org.jboss.esb.api.service.Service;
+import org.jboss.esb.api.service.ServiceException;
+import org.jboss.esb.api.service.ServiceName;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.annotations.Uninitialize;
+import org.jboss.esb.api.annotations.Property.Use;
+import org.jboss.esb.api.context.AddressingContext;
 import junit.framework.TestCase;
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/OutboundFilterConfigTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/OutboundFilterConfigTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/OutboundFilterConfigTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -25,7 +25,7 @@
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 import java.io.IOException;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/XProtDeploymentResource.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/XProtDeploymentResource.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/XProtDeploymentResource.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -21,7 +21,7 @@
 
 import java.net.URI;
 
-import org.jboss.esb.annotations.Property;
+import org.jboss.esb.api.annotations.Property;
 
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/digest/ConfigUtilTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/digest/ConfigUtilTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/digest/ConfigUtilTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -23,7 +23,7 @@
 
 import junit.framework.TestCase;
 
-import org.jboss.esb.annotations.Property;
+import org.jboss.esb.api.annotations.Property;
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.config.ConfigUtil;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/UndeployDispatcherDelayTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/UndeployDispatcherDelayTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/UndeployDispatcherDelayTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -26,7 +26,7 @@
 import org.jboss.esb.TestInboundRouter;
 import org.jboss.esb.TestOutboundRouter;
 import org.jboss.esb.TestService;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloInboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloInboundRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloInboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,10 +19,10 @@
  */
 package org.jboss.esb.dispatch;
 
-import org.jboss.esb.context.InvocationContext;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.InboundRouter;
-import org.jboss.esb.routing.MessageDispatcher;
+import org.jboss.esb.api.context.InvocationContext;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.MessageDispatcher;
+import org.jboss.esb.api.routing.InboundRouter;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloOutboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloOutboundRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloOutboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,14 +19,12 @@
  */
 package org.jboss.esb.dispatch;
 
-import org.jboss.esb.routing.InboundRouter;
-import org.jboss.esb.routing.MessageDispatcher;
-import org.jboss.esb.routing.RoutingException;
-import org.jboss.esb.routing.OutboundRouter;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.context.InvocationContext;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.DeploymentContext;
+import org.jboss.esb.api.routing.RoutingException;
+import org.jboss.esb.api.routing.OutboundRouter;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.context.InvocationContext;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.DeploymentContext;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloWorldService.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloWorldService.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/HelloWorldService.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,12 +19,12 @@
  */
 package org.jboss.esb.dispatch;
 
-import org.jboss.esb.service.Service;
-import org.jboss.esb.service.ServiceException;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.context.InvocationContext;
-import org.jboss.esb.context.AddressingContext;
-import org.jboss.esb.context.DeploymentContext;
+import org.jboss.esb.api.service.Service;
+import org.jboss.esb.api.service.ServiceException;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.context.InvocationContext;
+import org.jboss.esb.api.context.AddressingContext;
+import org.jboss.esb.api.context.DeploymentContext;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/LocalDispatcherTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/LocalDispatcherTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/LocalDispatcherTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -23,8 +23,8 @@
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.routing.RoutingException;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.routing.RoutingException;
+import org.jboss.esb.api.service.ServiceName;
 
 import java.io.IOException;
 import java.util.HashSet;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/RestStringTransformer.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/RestStringTransformer.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/dispatch/RestStringTransformer.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,12 +19,12 @@
  */
 package org.jboss.esb.dispatch;
 
-import org.jboss.esb.annotations.Property;
-import org.jboss.esb.context.DeploymentContext;
-import org.jboss.esb.context.InvocationContext;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.message.MessageProcessingException;
-import org.jboss.esb.message.MessageProcessor;
+import org.jboss.esb.api.annotations.Property;
+import org.jboss.esb.api.context.DeploymentContext;
+import org.jboss.esb.api.context.InvocationContext;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.message.MessageProcessingException;
+import org.jboss.esb.api.message.MessageProcessor;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/DeploymentServiceSetsTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/DeploymentServiceSetsTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/DeploymentServiceSetsTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,7 +20,7 @@
 package org.jboss.esb.federate;
 
 import junit.framework.TestCase;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -26,7 +26,7 @@
 import org.jboss.esb.test.JmsTestRunner;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -26,7 +26,7 @@
 import org.jboss.esb.TestInboundRouter;
 import org.jboss.esb.TestOutboundRouter;
 import org.jboss.esb.TestService;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -26,7 +26,7 @@
 import org.jboss.esb.TestInboundRouter;
 import org.jboss.esb.TestOutboundRouter;
 import org.jboss.esb.TestService;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -25,7 +25,7 @@
 import org.jboss.esb.test.JmsTestRunner;
 import org.jboss.esb.TestInboundRouter;
 import org.jboss.esb.TestOutboundRouter;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -24,7 +24,7 @@
 import org.jboss.esb.deploy.DeploymentUtil;
 import org.jboss.esb.test.JmsTestRunner;
 import org.jboss.esb.TestInboundRouter;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -26,7 +26,7 @@
 import org.jboss.esb.TestInboundRouter;
 import org.jboss.esb.TestOutboundRouter;
 import org.jboss.esb.TestService;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -25,7 +25,7 @@
 import org.jboss.esb.test.JmsTestRunner;
 import org.jboss.esb.TestInboundRouter;
 import org.jboss.esb.TestService;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -26,7 +26,7 @@
 import org.jboss.esb.TestInboundRouter;
 import org.jboss.esb.TestService;
 import org.jboss.esb.TestOutboundRouter;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -26,7 +26,7 @@
 import org.jboss.esb.TestInboundRouter;
 import org.jboss.esb.TestService;
 import org.jboss.esb.TestOutboundRouter;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -26,7 +26,7 @@
 import org.jboss.esb.TestInboundRouter;
 import org.jboss.esb.TestService;
 import org.jboss.esb.TestOutboundRouter;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -27,8 +27,8 @@
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
 import org.jboss.esb.federate.bus.BusMessage;
-import org.jboss.esb.service.ServiceException;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceException;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -28,7 +28,7 @@
 import org.jboss.esb.failure.DeadLetterPersistanceService;
 import org.jboss.esb.failure.MockDeadLetterService;
 import org.jboss.esb.federate.bus.BusMessage;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -28,8 +28,8 @@
 import org.jboss.esb.failure.MockDeadLetterService;
 import org.jboss.esb.federate.bus.BusMessage;
 import org.jboss.esb.test.JmsTestRunner;
-import org.jboss.esb.service.ServiceName;
-import org.jboss.esb.service.ServiceException;
+import org.jboss.esb.api.service.ServiceName;
+import org.jboss.esb.api.service.ServiceException;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -29,8 +29,8 @@
 import org.jboss.esb.failure.DeadLetterPersistanceService;
 import org.jboss.esb.failure.MockDeadLetterService;
 import org.jboss.esb.federate.bus.BusMessage;
-import org.jboss.esb.routing.RoutingException;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.routing.RoutingException;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_015/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_015/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_015/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -24,7 +24,7 @@
 import org.jboss.esb.TestService;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.test.JmsTestRunner;
 import org.milyn.io.StreamUtils;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_016/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_016/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_016/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -24,7 +24,7 @@
 import org.jboss.esb.TestService;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.test.JmsTestRunner;
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_017/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_017/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_017/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -24,7 +24,7 @@
 import org.jboss.esb.TestService;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.test.JmsTestRunner;
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_018/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_018/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_018/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -24,7 +24,7 @@
 import org.jboss.esb.TestService;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.test.JmsTestRunner;
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_019/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_019/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_019/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -24,7 +24,7 @@
 import org.jboss.esb.TestService;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_020/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_020/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_020/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -24,7 +24,7 @@
 import org.jboss.esb.TestService;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_021/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_021/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_021/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -24,7 +24,7 @@
 import org.jboss.esb.TestService;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_022/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_022/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_022/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -25,7 +25,7 @@
 import org.jboss.esb.TestOutboundRouter;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_023/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_023/RoutingTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_023/RoutingTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -24,7 +24,7 @@
 import org.jboss.esb.TestOutboundRouter;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.service.ServiceName;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/MockScheduledInboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/MockScheduledInboundRouter.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/MockScheduledInboundRouter.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -19,12 +19,12 @@
  */
 package org.jboss.esb.schedule;
 
-import org.jboss.esb.annotations.Initialize;
-import org.jboss.esb.context.InvocationContext;
+import org.jboss.esb.api.annotations.Initialize;
+import org.jboss.esb.api.context.InvocationContext;
 import org.jboss.esb.deploy.AssertDeployment;
-import org.jboss.esb.message.Message;
-import org.jboss.esb.routing.InboundRouter;
-import org.jboss.esb.routing.MessageDispatcher;
+import org.jboss.esb.api.message.Message;
+import org.jboss.esb.api.routing.MessageDispatcher;
+import org.jboss.esb.api.routing.InboundRouter;
 
 /**
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/ScheduleListenerTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/ScheduleListenerTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/ScheduleListenerTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -23,10 +23,10 @@
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.routing.RoutingException;
-import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.api.routing.RoutingException;
+import org.jboss.esb.api.service.ServiceName;
 import org.jboss.esb.dispatch.HelloWorldService;
-import org.jboss.esb.message.Message;
+import org.jboss.esb.api.message.Message;
 
 import java.io.IOException;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/serialization/java/JavaSerializerTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/serialization/java/JavaSerializerTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/serialization/java/JavaSerializerTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,7 +20,7 @@
 package org.jboss.esb.serialization.java;
 
 import junit.framework.TestCase;
-import org.jboss.esb.message.Message;
+import org.jboss.esb.api.message.Message;
 import org.jboss.esb.serialization.SerializationException;
 
 /**

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/util/XsdDOMValidatorTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/util/XsdDOMValidatorTest.java	2008-10-16 12:55:13 UTC (rev 23474)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/util/XsdDOMValidatorTest.java	2008-10-16 13:23:19 UTC (rev 23475)
@@ -20,7 +20,7 @@
 package org.jboss.esb.util;
 
 import junit.framework.TestCase;
-import org.jboss.esb.context.ResourceLocator;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.jboss.esb.deploy.DefaultResourceLocator;
 import org.jboss.esb.xml.XMLParseUtils;
 import org.w3c.dom.Document;




More information about the jboss-svn-commits mailing list