servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r564607 [1/12] - in /incubator/servicemix/trunk/core/servicemix-core/src: main/java/org/apache/servicemix/ main/java/org/apache/servicemix/jbi/ main/java/org/apache/servicemix/jbi/framework/ main/java/org/apache/servicemix/jbi/framework/sup...
Date Fri, 10 Aug 2007 14:38:14 GMT
Author: gnodet
Date: Fri Aug 10 07:37:46 2007
New Revision: 564607

URL: http://svn.apache.org/viewvc?view=rev&rev=564607
Log:
Fix checkstyle violations

Modified:
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/JbiConstants.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/MessageExchangeListener.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoEndpointAvailableException.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoFaultAvailableException.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoInterfaceAvailableException.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceAvailableException.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceEndpointAvailableException.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/EndpointRegistry.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationContextImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationService.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ManagementSupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/Registry.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyRegistry.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitLifeCycle.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitMBean.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SharedLibrary.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SharedLibraryMBean.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SubscriptionRegistry.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/support/SUDescriptorProcessor.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/support/WSDL1Processor.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/support/WSDL2Processor.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/BytesSource.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamWriter.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedNamespaceContext.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/QNameHelper.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ResourceSource.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceTransformer.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StaxSource.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StringSource.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamWriter.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/W3CNamespaceContext.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/XMLStreamHelper.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/JaasAuthenticator.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/PasswordAuthenticator.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/RmiRegistryFactoryBean.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/logging/LogService.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/logging/LogServiceMBean.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/logging/LogTask.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/AttributeInfoHelper.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseLifeCycle.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseStandardMBean.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseSystemService.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/CachedAttribute.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/MBeanBuilder.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/MBeanInfoProvider.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/MBeanServerContext.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ManagementContext.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ManagementContextMBean.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/OperationInfoHelper.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ParameterHelper.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/DeployServiceAssemblyTask.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallSharedLibraryTask.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ShutDownComponentTask.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DefaultMarshaler.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/ExchangePacket.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/FaultImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/InOnlyImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/InOptionalOutImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/InOutImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeSupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/PojoMarshaler.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/RobustInOnlyImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/monitoring/ComponentStats.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/monitoring/ComponentStatsMBean.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/monitoring/EndpointStatsMBean.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/monitoring/MessagingStats.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/monitoring/StatisticsService.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/monitoring/StatisticsServiceMBean.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/monitoring/stats/CountStatisticImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/monitoring/stats/Resettable.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/monitoring/stats/StatsImpl.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/Broker.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/DefaultBroker.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/SubscriptionManager.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/AbstractFlow.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/DefaultFlowChooser.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/Flow.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/AbstractJMSFlow.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlowTibco.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaQueue.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/st/STFlow.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/resolver/EndpointFilter.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/resolver/EndpointResolverSupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/resolver/ExternalInterfaceNameEndpointResolver.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/resolver/ExternalServiceNameEndpointResolver.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/resolver/InterfaceNameEndpointResolver.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/resolver/NullEndpointFilter.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/resolver/ServiceAndEndpointNameResolver.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/resolver/ServiceNameEndpointResolver.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/resolver/SubscriptionFilter.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/resolver/URIResolver.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/GroupPrincipal.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/UserPrincipal.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/impl/AuthorizationEntry.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/acl/impl/DefaultAuthorizationMap.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/auth/impl/JAASAuthenticationService.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/keystore/KeystoreInstance.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/keystore/KeystoreManager.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/keystore/impl/BaseKeystoreManager.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/keystore/impl/FileKeystoreInstance.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/login/CertificatesLoginModule.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/security/login/PropertiesLoginModule.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/AbstractServiceEndpoint.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/DynamicEndpoint.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilder.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/EndpointSupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/ExternalEndpoint.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/servicedesc/InternalEndpoint.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/ByteArrayDataSource.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/DOMUtil.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FastStack.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileUtil.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FileVersionUtil.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IntrospectionSupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/LazyDOMSource.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MultiplexOutputStream.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/QNameUtil.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/StreamDataSource.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/URISupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/WSAddressingConstants.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/XmlPersistenceSupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/view/DotViewEndpointListener.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/view/EndpointViewRenderer.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/tck/AsyncReceiverPojo.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/tck/MessageList.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/tck/Receiver.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/tck/SenderComponent.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/tck/SenderPojo.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/tck/SpringTestSupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/tck/TestSupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/ClientDestinationTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/SimpleClientTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/components/util/ChainedComponentTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/components/util/CopyTransformerTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/components/util/PropertyAddTransformer.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/components/util/SimpleFlatFileMarshalerTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/expression/ExpressionTestSupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/expression/JAXPXPathExpressionTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/expression/XPathExpressionTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteWithVanillaSpringTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteWithVanillaSpringTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/DebugClassPathXmlApplicationContext.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/XmlParseTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ComponentTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/deployment/ServiceAssemblyTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/framework/ComponentNameSpaceTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/framework/RegistryTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/AbstractManagementTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/Bootstrap1.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/BootstrapDelegate.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/Component1.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/Component2.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/ComponentDelegate.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentMessageTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/DeploymentTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/ExtMockControl.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/HotDeployTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/InstallationTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/SourceTransformerTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/loaders/ClassLoaderTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/AdminServiceTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementAttributesTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractClusteredTransactionTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImplTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JmsFlowTransactionTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MEPExchangeTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeImplTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/SedaFlowTransactionTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/StFlowTransactionTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/BrokerTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionPropertyCopyTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/SubscriptionTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/FlowProviderTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlowTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/PingService.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJmsFlowTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/FileKeystoreManagerTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/GroupPrincipalTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SecuredBrokerTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/UserPrincipalTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/InternalEndpointTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/util/FileUtilTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/util/MessageCopierTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/tck/ExamplePojoTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringAsyncPojoTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringComponentTest.java
    incubator/servicemix/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringPojoTest.java

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/JbiConstants.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/JbiConstants.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/JbiConstants.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/JbiConstants.java Fri Aug 10 07:37:46 2007
@@ -16,39 +16,38 @@
  */
 package org.apache.servicemix;
 
-
 public interface JbiConstants {
 
     String SEND_SYNC = "javax.jbi.messaging.sendSync";
-    
+
     String PROTOCOL_TYPE = "javax.jbi.messaging.protocol.type";
-    
+
     String PROTOCOL_HEADERS = "javax.jbi.messaging.protocol.headers";
-    
+
     String SECURITY_SUBJECT = "javax.jbi.security.subject";
-    
+
     String SOAP_HEADERS = "org.apache.servicemix.soap.headers";
-    
-	String PERSISTENT_PROPERTY_NAME = "org.apache.servicemix.persistent";
-    
+
+    String PERSISTENT_PROPERTY_NAME = "org.apache.servicemix.persistent";
+
     String DATESTAMP_PROPERTY_NAME = "org.apache.servicemix.datestamp";
-    
+
     String FLOW_PROPERTY_NAME = "org.apache.servicemix.flow";
-    
+
     String STATELESS_CONSUMER = "org.apache.servicemix.consumer.stateless";
-    
+
     String STATELESS_PROVIDER = "org.apache.servicemix.provider.stateless";
-    
+
     String SENDER_ENDPOINT = "org.apache.servicemix.senderEndpoint";
 
     String HTTP_DESTINATION_URI = "org.apache.servicemix.http.destination.uri";
-    
+
     /**
      * This property should be set when a consumer endpoint creates an exchange
-     * related to another provider exchange.  The value of the property should
-     * be set to the value of this property in the provider exchange,
-     * or to the id of the provider exchange if the property does not exist.
+     * related to another provider exchange. The value of the property should be
+     * set to the value of this property in the provider exchange, or to the id
+     * of the provider exchange if the property does not exist.
      */
     String CORRELATION_ID = "org.apache.servicemix.correlationId";
-    
+
 }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/Main.java Fri Aug 10 07:37:46 2007
@@ -21,19 +21,22 @@
 import java.util.List;
 
 import org.apache.servicemix.jbi.container.SpringJBIContainer;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.context.ApplicationContext;
 import org.apache.xbean.server.repository.FileSystemRepository;
 import org.apache.xbean.server.spring.configuration.ClassLoaderXmlPreprocessor;
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.apache.xbean.spring.context.FileSystemXmlApplicationContext;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.context.ApplicationContext;
 
 /**
  * A simple stand alone application which runs ServiceMix from the command line.
  *
  * @version $Revision$
  */
-public class Main {
+public final class Main {
+    
+    private Main() {
+    }
 
     public static void main(String args[]) {
         try {
@@ -49,8 +52,7 @@
             if (args.length <= 0) {
                 System.out.println("Loading Apache ServiceMix from servicemix.xml on the CLASSPATH");
                 context = new ClassPathXmlApplicationContext("servicemix.xml");
-            }
-            else {
+            } else {
                 String file = args[0];
 
                 if (file.equals("-?") || file.equals("?") || file.equals("--help") || file.equals("-h")) {
@@ -75,8 +77,7 @@
             if (context instanceof DisposableBean) {
                 ((DisposableBean) context).destroy();
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             System.out.println("Caught: " + e);
             e.printStackTrace();
         }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/MessageExchangeListener.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/MessageExchangeListener.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/MessageExchangeListener.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/MessageExchangeListener.java Fri Aug 10 07:37:46 2007
@@ -34,5 +34,6 @@
      * @param exchange
      * @throws MessagingException
      */
-    public void onMessageExchange(MessageExchange exchange) throws MessagingException;
+    void onMessageExchange(MessageExchange exchange) throws MessagingException;
+
 }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoEndpointAvailableException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoEndpointAvailableException.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoEndpointAvailableException.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoEndpointAvailableException.java Fri Aug 10 07:37:46 2007
@@ -17,7 +17,6 @@
 package org.apache.servicemix.jbi;
 
 import javax.jbi.JBIException;
-import javax.jbi.servicedesc.ServiceEndpoint;
 
 /**
  * An exception thrown if a {@link ServiceEndpoint} is unavailable

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoFaultAvailableException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoFaultAvailableException.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoFaultAvailableException.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoFaultAvailableException.java Fri Aug 10 07:37:46 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.servicemix.jbi;
 
-import javax.jbi.messaging.Fault;
 import javax.jbi.messaging.MessageExchange;
 import javax.jbi.messaging.MessagingException;
 

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoInterfaceAvailableException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoInterfaceAvailableException.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoInterfaceAvailableException.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoInterfaceAvailableException.java Fri Aug 10 07:37:46 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.servicemix.jbi;
 
-import javax.jbi.servicedesc.ServiceEndpoint;
 import javax.xml.namespace.QName;
 
 /**

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceAvailableException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceAvailableException.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceAvailableException.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceAvailableException.java Fri Aug 10 07:37:46 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.servicemix.jbi;
 
-import javax.jbi.servicedesc.ServiceEndpoint;
 import javax.xml.namespace.QName;
 
 /**

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceEndpointAvailableException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceEndpointAvailableException.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceEndpointAvailableException.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceEndpointAvailableException.java Fri Aug 10 07:37:46 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.servicemix.jbi;
 
-import javax.jbi.servicedesc.ServiceEndpoint;
 import javax.xml.namespace.QName;
 
 /**

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java Fri Aug 10 07:37:46 2007
@@ -235,6 +235,7 @@
             try {
                 sa.shutDown();
             } catch (Exception e) {
+                // Ignore
             }
 
             String result = null;
@@ -468,33 +469,7 @@
         // Check all SUs requirements
         ServiceUnit[] sus = sa.getServiceUnits();
         if (sus != null) {
-            for (int i = 0; i < sus.length; i++) {
-                String suName = sus[i].getIdentification().getName();
-                String artifact = sus[i].getTarget().getArtifactsZip();
-                String componentName = sus[i].getTarget().getComponentName();
-                File artifactFile = new File(saDirectory, artifact);
-                if (!artifactFile.exists()) {
-                    throw ManagementSupport.failure("deploy", "Artifact " + artifact + " not found for service unit " + suName);
-                }
-                ComponentMBeanImpl lcc = container.getComponent(componentName);
-                if (lcc == null) {
-                    throw ManagementSupport.failure("deploy", "Target component " + componentName
-                                                                + " for service unit " + suName + " is not installed");
-                }
-                if (!lcc.isStarted()) {
-                    throw ManagementSupport.failure("deploy", "Target component " + componentName
-                                                                + " for service unit " + suName + " is not started");
-                }
-                if (lcc.getServiceUnitManager() == null) {
-                    throw ManagementSupport.failure("deploy", "Target component " + componentName
-                                                                + " for service unit " + suName + " does not accept deployments");
-                }
-                // TODO: check duplicates here ?
-                if (isDeployedServiceUnit(componentName, suName)) {
-                    throw ManagementSupport.failure("deploy", "Service unit " + suName
-                                                                + " is already deployed on component " + componentName);
-                }
-            }
+            checkSus(saDirectory, sus);
         }
         // Everything seems ok, so deploy all SUs
         int nbSuccess = 0;
@@ -582,6 +557,36 @@
             }
         }
     }
+
+    protected void checkSus(File saDirectory, ServiceUnit[] sus) throws Exception {
+        for (int i = 0; i < sus.length; i++) {
+            String suName = sus[i].getIdentification().getName();
+            String artifact = sus[i].getTarget().getArtifactsZip();
+            String componentName = sus[i].getTarget().getComponentName();
+            File artifactFile = new File(saDirectory, artifact);
+            if (!artifactFile.exists()) {
+                throw ManagementSupport.failure("deploy", "Artifact " + artifact + " not found for service unit " + suName);
+            }
+            ComponentMBeanImpl lcc = container.getComponent(componentName);
+            if (lcc == null) {
+                throw ManagementSupport.failure("deploy", "Target component " + componentName
+                                                            + " for service unit " + suName + " is not installed");
+            }
+            if (!lcc.isStarted()) {
+                throw ManagementSupport.failure("deploy", "Target component " + componentName
+                                                            + " for service unit " + suName + " is not started");
+            }
+            if (lcc.getServiceUnitManager() == null) {
+                throw ManagementSupport.failure("deploy", "Target component " + componentName
+                                                            + " for service unit " + suName + " does not accept deployments");
+            }
+            // TODO: check duplicates here ?
+            if (isDeployedServiceUnit(componentName, suName)) {
+                throw ManagementSupport.failure("deploy", "Service unit " + suName
+                                                            + " is already deployed on component " + componentName);
+            }
+        }
+    }
     
     protected void getComponentTaskError(Exception exception, String component, List<Element> results) {
         Element result = null;
@@ -689,26 +694,28 @@
         LOG.info("Restoring service assemblies");
         // walk through deployed SA's
         File top = environmentContext.getServiceAssembliesDir();
-        if (top != null && top.exists() && top.isDirectory()) {
-            File[] files = top.listFiles();
-            if (files != null) {
-                // Initialize all assemblies
-                for (int i = 0; i < files.length; i++) {
-                    if (files[i].isDirectory()) {
-                        String assemblyName = files[i].getName();
-                        try {
-                            ServiceAssemblyEnvironment env = environmentContext.getServiceAssemblyEnvironment(assemblyName);
-                            Descriptor root = DescriptorFactory.buildDescriptor(env.getInstallDir());
-                            if (root != null) {
-                                ServiceAssembly sa = root.getServiceAssembly();
-                                if (sa != null && sa.getIdentification() != null) {
-                                    registry.registerServiceAssembly(sa, env);
-                                }
-                            }
-                        } catch (Exception e) {
-                            LOG.error("Failed to initialized service assembly: " + assemblyName, e);
+        if (top == null || !top.exists() || !top.isDirectory()) {
+            return;
+        }
+        File[] files = top.listFiles();
+        if (files == null) {
+            return;
+        }
+        // Initialize all assemblies
+        for (int i = 0; i < files.length; i++) {
+            if (files[i].isDirectory()) {
+                String assemblyName = files[i].getName();
+                try {
+                    ServiceAssemblyEnvironment env = environmentContext.getServiceAssemblyEnvironment(assemblyName);
+                    Descriptor root = DescriptorFactory.buildDescriptor(env.getInstallDir());
+                    if (root != null) {
+                        ServiceAssembly sa = root.getServiceAssembly();
+                        if (sa != null && sa.getIdentification() != null) {
+                            registry.registerServiceAssembly(sa, env);
                         }
                     }
+                } catch (Exception e) {
+                    LOG.error("Failed to initialized service assembly: " + assemblyName, e);
                 }
             }
         }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/EndpointRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/EndpointRegistry.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/EndpointRegistry.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/EndpointRegistry.java Fri Aug 10 07:37:46 2007
@@ -435,7 +435,8 @@
                                            QName toSvc, String toEp, String link) throws JBIException {
         LinkedEndpoint ep = new LinkedEndpoint(fromSvc, fromEp, toSvc, toEp, link);
         if (linkedEndpoints.get(getKey(ep)) != null) {
-            throw new JBIException("An endpoint connection for service " + ep.getServiceName() + " and name " + ep.getEndpointName() + " is already registered");
+            throw new JBIException("An endpoint connection for service " + ep.getServiceName() + " and name "
+                                        + ep.getEndpointName() + " is already registered");
         }
         linkedEndpoints.put(getKey(ep), ep);
         registerEndpoint(ep);

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationContextImpl.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationContextImpl.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationContextImpl.java Fri Aug 10 07:37:46 2007
@@ -23,7 +23,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.jbi.component.Bootstrap;
 import javax.jbi.component.ComponentContext;
 import javax.jbi.component.InstallationContext;
 
@@ -49,9 +48,9 @@
     
     public InstallationContextImpl(Component descriptor) {
         this.descriptor = descriptor;
-        if (descriptor.getComponentClassPath() != null &&
-            descriptor.getComponentClassPath().getPathElements() != null &&
-            descriptor.getComponentClassPath().getPathElements().length > 0) {
+        if (descriptor.getComponentClassPath() != null
+                && descriptor.getComponentClassPath().getPathElements() != null
+                && descriptor.getComponentClassPath().getPathElements().length > 0) {
             String[] elems = descriptor.getComponentClassPath().getPathElements();
             for (int i = 0; i < elems.length; i++) {
                 if (File.separatorChar == '\\') {
@@ -142,7 +141,7 @@
      * 
      * @return Return the install root
      */
-    public File getInstallRootAsDir(){
+    public File getInstallRootAsDir() {
         return installRoot;
     }
 
@@ -201,13 +200,13 @@
         }
         for (Iterator iter = classPathElements.iterator(); iter.hasNext();) {
             Object obj = iter.next();
-            if (obj instanceof String == false) {
+            if (!(obj instanceof String)) {
                 throw new IllegalArgumentException("classPathElements must contain element of type String");
             }
             String element = (String) obj;
             String sep = File.separator.equals("\\") ? "/" : "\\";
             int offset = element.indexOf(sep);
-            if ( offset > -1 ) {
+            if (offset > -1) {
                 throw new IllegalArgumentException("classPathElements contains an invalid file separator '" + sep + "'"); 
             }
             File f = new File((String) element);

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationService.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationService.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationService.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationService.java Fri Aug 10 07:37:46 2007
@@ -21,6 +21,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.jbi.JBIException;
 import javax.jbi.management.DeploymentException;
@@ -48,8 +49,6 @@
 import org.apache.servicemix.jbi.util.FileUtil;
 import org.apache.servicemix.jbi.util.FileVersionUtil;
 
-import java.util.concurrent.ConcurrentHashMap;
-
 /**
  * Installation Service - installs/uninstalls archives
  * 
@@ -435,8 +434,8 @@
         }
     }
 
-    private InstallerMBeanImpl initializeInstaller(File installationDir, File componentRoot, Component descriptor)
-                    throws DeploymentException {
+    private InstallerMBeanImpl initializeInstaller(File installationDir, File componentRoot, 
+                                                   Component descriptor) throws DeploymentException {
         InstallerMBeanImpl result = null;
         try {
             String name = descriptor.getIdentification().getName();
@@ -484,21 +483,25 @@
             File[] files = top.listFiles();
             if (files != null) {
                 for (int i = 0; i < files.length; i++) {
-                    if (files[i].isDirectory()) {
-                        File dir = FileVersionUtil.getLatestVersionDirectory(files[i]);
-                        if (dir != null) {
-                            Descriptor root = DescriptorFactory.buildDescriptor(dir);
-                            if (root != null) {
-                                SharedLibrary sl = root.getSharedLibrary();
-                                if (sl != null) {
-                                    try {
-                                        container.getRegistry().registerSharedLibrary(sl, dir);
-                                    } catch (Exception e) {
-                                        LOG.error("Failed to initialize sharted library", e);
-                                    }
-                                }
-                            }
-                        }
+                    if (!files[i].isDirectory()) {
+                        continue;
+                    }
+                    File dir = FileVersionUtil.getLatestVersionDirectory(files[i]);
+                    if (dir == null) {
+                        continue;
+                    }
+                    Descriptor root = DescriptorFactory.buildDescriptor(dir);
+                    if (root == null) {
+                        continue;
+                    }
+                    SharedLibrary sl = root.getSharedLibrary();
+                    if (sl == null) {
+                        continue;
+                    }
+                    try {
+                        container.getRegistry().registerSharedLibrary(sl, dir);
+                    } catch (Exception e) {
+                        LOG.error("Failed to initialize sharted library", e);
                     }
                 }
             }
@@ -514,15 +517,16 @@
             File[] files = top.listFiles();
             if (files != null) {
                 for (int i = 0; i < files.length; i++) {
-                    if (files[i].isDirectory()) {
-                        final File directory = files[i];
-                        try {
-                            buildComponent(directory);
-                        } catch (DeploymentException e) {
-                            LOG.error("Could not build Component: " + directory.getName(), e);
-                            LOG.warn("Deleting Component directory: " + directory);
-                            FileUtil.deleteFile(directory);
-                        }
+                    if (!files[i].isDirectory()) {
+                        continue;
+                    }
+                    final File directory = files[i];
+                    try {
+                        buildComponent(directory);
+                    } catch (DeploymentException e) {
+                        LOG.error("Could not build Component: " + directory.getName(), e);
+                        LOG.warn("Deleting Component directory: " + directory);
+                        FileUtil.deleteFile(directory);
                     }
                 }
             }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java Fri Aug 10 07:37:46 2007
@@ -75,9 +75,9 @@
                 // Unregister a previously registered extension mbean,
                 // in case the bootstrap has not done it
                 try {
-                    if (extensionMBeanName != null &&
-                        container.getMBeanServer() != null &&
-                        container.getMBeanServer().isRegistered(extensionMBeanName)) {
+                    if (extensionMBeanName != null
+                            && container.getMBeanServer() != null
+                            && container.getMBeanServer().isRegistered(extensionMBeanName)) {
                         container.getMBeanServer().unregisterMBean(extensionMBeanName);
                     }
                 } catch (InstanceNotFoundException e) {
@@ -118,8 +118,8 @@
                                     null);
             Thread.currentThread().setContextClassLoader(cl);
             Class bootstrapClass = cl.loadClass(descriptor.getBootstrapClassName());
-            Bootstrap bootstrap = (Bootstrap) bootstrapClass.newInstance();
-            return bootstrap;
+            Bootstrap bs = (Bootstrap) bootstrapClass.newInstance();
+            return bs;
         } catch (MalformedURLException e) {
             LOG.error("Could not create class loader", e);
             throw new DeploymentException(e);
@@ -249,7 +249,7 @@
             // If it was found by a destroyable classloader destroy it
             // XXX Should we be holding the classloader as a member as always destroying it?
             if (bootstrap.getClass().getClassLoader() instanceof DestroyableClassLoader) {
-            	((DestroyableClassLoader) bootstrap.getClass().getClassLoader()).destroy();
+                ((DestroyableClassLoader) bootstrap.getClass().getClassLoader()).destroy();
             }
             System.gc();
             container.getEnvironmentContext().removeComponentRootDirectory(componentName);
@@ -311,7 +311,7 @@
                 parents[i] = sl.getClassLoader();
             }
         } else {
-            parents = new ClassLoader[] { getClass().getClassLoader() };
+            parents = new ClassLoader[] {getClass().getClassLoader() };
         }
         
         List urls = new ArrayList();
@@ -331,7 +331,7 @@
                         parents, 
                         !parentFirst,
                         new String[0],
-                        new String[] { "java.", "javax." }); 
+                        new String[] {"java.", "javax." }); 
         if (LOG.isDebugEnabled()) {
             LOG.debug("Component class loader: " + cl);
         }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ManagementSupport.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ManagementSupport.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ManagementSupport.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ManagementSupport.java Fri Aug 10 07:37:46 2007
@@ -36,9 +36,12 @@
 /**
  * ManagementMessageHelper is a class that ease the building of management messages. 
  */
-public class ManagementSupport {
+public final class ManagementSupport {
     
-    private static final Log logger = LogFactory.getLog(ManagementSupport.class);
+    private static final Log LOG = LogFactory.getLog(ManagementSupport.class);
+    
+    private ManagementSupport() {
+    }
 
     public static class Message {
         private boolean isCauseFramework;
@@ -59,8 +62,8 @@
         public boolean isCauseFramework() {
             return isCauseFramework;
         }
-        public void setCauseFramework(boolean isCauseFramework) {
-            this.isCauseFramework = isCauseFramework;
+        public void setCauseFramework(boolean value) {
+            this.isCauseFramework = value;
         }
         public String getMessage() {
             return message;
@@ -172,7 +175,7 @@
             }
             return DOMUtil.asIndentedXML(doc);
         } catch (Exception e) {
-            logger.error("Error", e);
+            LOG.error("Error", e);
             return null;
         }
     }
@@ -236,8 +239,8 @@
             Element e = createComponentFailure(task, component, info, null);
             return new DeploymentException(DOMUtil.asXML(e));
         } catch (Exception e) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Error creating management message", e);
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Error creating management message", e);
             }
             return new DeploymentException(info);
         }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/Registry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/Registry.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/Registry.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/Registry.java Fri Aug 10 07:37:46 2007
@@ -21,6 +21,8 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.jbi.JBIException;
 import javax.jbi.component.Component;
@@ -32,6 +34,12 @@
 import javax.management.ObjectName;
 import javax.xml.namespace.QName;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.executors.Executor;
@@ -51,14 +59,6 @@
 import org.apache.servicemix.jbi.servicedesc.InternalEndpoint;
 import org.apache.servicemix.jbi.util.DOMUtil;
 import org.apache.servicemix.jbi.util.WSAddressingConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Registry - state infomation including running state, SA's deployed etc.
@@ -67,7 +67,8 @@
  */
 public class Registry extends BaseSystemService implements RegistryMBean {
     
-    private static final Log log = LogFactory.getLog(Registry.class);
+    private static final Log LOG = LogFactory.getLog(Registry.class);
+    
     private ComponentRegistry componentRegistry;
     private EndpointRegistry endpointRegistry;
     private SubscriptionRegistry subscriptionRegistry;
@@ -384,7 +385,7 @@
                 }
             }
         } catch (Exception e) {
-            log.debug("Unable to resolve EPR: " + e);
+            LOG.debug("Unable to resolve EPR: " + e);
         }
         return null;
     }
@@ -563,7 +564,7 @@
         InternalEndpoint endpoint = new InternalEndpoint(context.getComponentNameSpace(), endpointName, service);
         SubscriptionSpec[] specs = as.getSubscriptions();
         if (specs != null) {
-            for (int i =0; i<specs.length; i++) {
+            for (int i = 0; i < specs.length; i++) {
                 registerSubscription(context, specs[i], endpoint);
             }
         }
@@ -577,8 +578,8 @@
     public void deregisterSubscriptions(ComponentContextImpl context, ActivationSpec as) {
         SubscriptionSpec[] specs = as.getSubscriptions();
         if (specs != null) {
-            for (int i =0; i<specs.length; i++) {
-                deregisterSubscription(context,specs[i]);
+            for (int i = 0; i < specs.length; i++) {
+                deregisterSubscription(context, specs[i]);
             }
         }
     }
@@ -591,7 +592,7 @@
     public void registerSubscription(ComponentContextImpl context, SubscriptionSpec subscription, ServiceEndpoint endpoint) {
         InternalEndpoint sei = (InternalEndpoint)endpoint;
         subscription.setName(context.getComponentNameSpace());
-        subscriptionRegistry.registerSubscription(subscription,sei);
+        subscriptionRegistry.registerSubscription(subscription, sei);
     }
 
     /**
@@ -651,7 +652,7 @@
      * @param name
      * @return the ServiceAssembly or null if it doesn't exist
      */
-    public ServiceAssemblyLifeCycle getServiceAssembly(String saName){
+    public ServiceAssemblyLifeCycle getServiceAssembly(String saName) {
         return serviceAssemblyRegistry.getServiceAssembly(saName);
     }
 
@@ -754,7 +755,7 @@
             ObjectName objectName = getContainer().getManagementContext().createObjectName(sulc);
             getContainer().getManagementContext().registerMBean(objectName, sulc, ServiceUnitMBean.class);
         } catch (JMException e) {
-            log.error("Could not register MBean for service unit", e);
+            LOG.error("Could not register MBean for service unit", e);
         }
         return sulc.getKey();
     }
@@ -770,7 +771,7 @@
             try {
                 getContainer().getManagementContext().unregisterMBean(sulc);
             } catch (JBIException e) {
-                log.error("Could not unregister MBean for service unit", e);
+                LOG.error("Could not unregister MBean for service unit", e);
             }
         }
     }
@@ -783,7 +784,7 @@
             ObjectName objectName = getContainer().getManagementContext().createObjectName(library);
             getContainer().getManagementContext().registerMBean(objectName, library, SharedLibraryMBean.class);
         } catch (JMException e) {
-            log.error("Could not register MBean for service unit", e);
+            LOG.error("Could not register MBean for service unit", e);
         }
         checkPendingComponents();
     }
@@ -797,7 +798,7 @@
                 getContainer().getManagementContext().unregisterMBean(sl);
                 sl.dispose();
             } catch (JBIException e) {
-                log.error("Could not unregister MBean for shared library", e);
+                LOG.error("Could not unregister MBean for shared library", e);
             }
         }
     }
@@ -864,7 +865,7 @@
                     sa.restore();
                     pendingAssemblies.remove(sa);
                 } catch (Exception e) {
-                    log.error("Error trying to restore service assembly state", e);
+                    LOG.error("Error trying to restore service assembly state", e);
                 }
             }
         }
@@ -900,7 +901,7 @@
     
     public ObjectName[] getEndpointNames() {
         List<ObjectName> tmpList = new ArrayList<ObjectName>();
-        for (Endpoint ep : container.getRegistry().getEndpointRegistry().getEndpointMBeans()){
+        for (Endpoint ep : container.getRegistry().getEndpointRegistry().getEndpointMBeans()) {
             tmpList.add(container.getManagementContext().createObjectName(ep));
         }
         return tmpList.toArray(new ObjectName[tmpList.size()]);
@@ -908,7 +909,7 @@
 
     public ObjectName[] getServiceAssemblyNames() {
         List<ObjectName> tmpList = new ArrayList<ObjectName>();
-        for (ServiceAssemblyLifeCycle sa : getServiceAssemblies()){
+        for (ServiceAssemblyLifeCycle sa : getServiceAssemblies()) {
             tmpList.add(container.getManagementContext().createObjectName(sa));
         }
         return tmpList.toArray(new ObjectName[tmpList.size()]);

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java Fri Aug 10 07:37:46 2007
@@ -93,8 +93,8 @@
         this.registry = registry;
     }
     
-    protected void setServiceUnits(ServiceUnitLifeCycle[] sus) {
-        this.sus = sus;
+    protected void setServiceUnits(ServiceUnitLifeCycle[] serviceUnits) {
+        this.sus = serviceUnits;
     }
 
     /**
@@ -295,9 +295,9 @@
     void writeRunningState() {
         try {
             if (env.getStateFile() != null) {
-                String currentState = getCurrentState();
+                String state = getCurrentState();
                 Properties props = new Properties();
-                props.setProperty("state", currentState);
+                props.setProperty("state", state);
                 XmlPersistenceSupport.write(env.getStateFile(), props);
             }
         } catch (IOException e) {
@@ -369,8 +369,8 @@
             if (s != null && s.getConsumes() != null) {
                 Consumes[] consumes = s.getConsumes();
                 for (int j = 0; j < consumes.length; j++) {
-                    if (svc.equals(consumes[j].getServiceName()) &&
-                        ep.equals(consumes[j].getEndpointName())) {
+                    if (svc.equals(consumes[j].getServiceName())
+                            && ep.equals(consumes[j].getEndpointName())) {
                         return consumes[j].getLinkType();
                     }
                 }
@@ -463,10 +463,10 @@
         this.listener = l;
     }
 
-    protected void firePropertyChanged(String name, Object oldValue, Object newValue){
+    protected void firePropertyChanged(String name, Object oldValue, Object newValue) {
         PropertyChangeListener l = listener;
-        if (l != null){
-            PropertyChangeEvent event = new PropertyChangeEvent(this,name,oldValue,newValue);
+        if (l != null) {
+            PropertyChangeEvent event = new PropertyChangeEvent(this, name, oldValue, newValue);
             l.propertyChange(event);
         }
     }
@@ -485,7 +485,8 @@
     
     protected void fireEvent(int type) {
         ServiceAssemblyEvent event = new ServiceAssemblyEvent(this, type);
-        ServiceAssemblyListener[] listeners = (ServiceAssemblyListener[]) registry.getContainer().getListeners(ServiceAssemblyListener.class);
+        ServiceAssemblyListener[] listeners = 
+                (ServiceAssemblyListener[]) registry.getContainer().getListeners(ServiceAssemblyListener.class);
         for (int i = 0; i < listeners.length; i++) {
             switch (type) {
             case ServiceAssemblyEvent.ASSEMBLY_STARTED:
@@ -496,6 +497,8 @@
                 break;
             case ServiceAssemblyEvent.ASSEMBLY_SHUTDOWN:
                 listeners[i].assemblyShutDown(event);
+                break;
+            default:
                 break;
             }
         }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyRegistry.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyRegistry.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyRegistry.java Fri Aug 10 07:37:46 2007
@@ -74,8 +74,8 @@
     public void shutDown() {
     }
 
-    public ServiceAssemblyLifeCycle register(ServiceAssembly sa, String[] suKeys, ServiceAssemblyEnvironment env)
-                    throws DeploymentException {
+    public ServiceAssemblyLifeCycle register(ServiceAssembly sa, String[] suKeys, 
+                                             ServiceAssemblyEnvironment env) throws DeploymentException {
         String saName = sa.getIdentification().getName();
         if (!serviceAssemblies.containsKey(saName)) {
             ServiceAssemblyLifeCycle salc = new ServiceAssemblyLifeCycle(sa, env, registry);
@@ -217,7 +217,8 @@
             ServiceUnit[] sus = salc.getServiceAssembly().getServiceUnits();
             if (sus != null) {
                 for (int i = 0; i < sus.length; i++) {
-                    if (sus[i].getTarget().getComponentName().equals(componentName) && sus[i].getIdentification().getName().equals(suName)) {
+                    if (sus[i].getTarget().getComponentName().equals(componentName)
+                                    && sus[i].getIdentification().getName().equals(suName)) {
                         result = true;
                         break;
                     }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitLifeCycle.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitLifeCycle.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitLifeCycle.java Fri Aug 10 07:37:46 2007
@@ -199,13 +199,16 @@
         String suName = getName();
         ComponentMBeanImpl lcc = registry.getComponent(componentName);
         if (lcc == null) {
-            throw ManagementSupport.componentFailure("deploy", componentName, "Target component " + componentName + " for service unit " + suName + " is not installed");
+            throw ManagementSupport.componentFailure("deploy", componentName, "Target component "
+                            + componentName + " for service unit " + suName + " is not installed");
         }
         if (!lcc.isStarted()) {
-            throw ManagementSupport.componentFailure("deploy", componentName, "Target component " + componentName + " for service unit " + suName + " is not started");
+            throw ManagementSupport.componentFailure("deploy", componentName, "Target component "
+                            + componentName + " for service unit " + suName + " is not started");
         }
         if (lcc.getServiceUnitManager() == null) {
-            throw ManagementSupport.componentFailure("deploy", componentName, "Target component " + componentName + " for service unit " + suName + " does not accept deployments");
+            throw ManagementSupport.componentFailure("deploy", componentName, "Target component "
+                            + componentName + " for service unit " + suName + " does not accept deployments");
         }
     }
     
@@ -214,13 +217,16 @@
         String suName = getName();
         ComponentMBeanImpl lcc = registry.getComponent(componentName);
         if (lcc == null) {
-            throw ManagementSupport.componentFailure("deploy", componentName, "Target component " + componentName + " for service unit " + suName + " is not installed");
+            throw ManagementSupport.componentFailure("deploy", componentName, "Target component "
+                            + componentName + " for service unit " + suName + " is not installed");
         }
         if (!lcc.isStarted() && !lcc.isStopped()) {
-            throw ManagementSupport.componentFailure("deploy", componentName, "Target component " + componentName + " for service unit " + suName + " is not started");
+            throw ManagementSupport.componentFailure("deploy", componentName, "Target component "
+                            + componentName + " for service unit " + suName + " is not started");
         }
         if (lcc.getServiceUnitManager() == null) {
-            throw ManagementSupport.componentFailure("deploy", componentName, "Target component " + componentName + " for service unit " + suName + " does not accept deployments");
+            throw ManagementSupport.componentFailure("deploy", componentName, "Target component "
+                            + componentName + " for service unit " + suName + " does not accept deployments");
         }
     }
     
@@ -267,14 +273,14 @@
         return getComponentName();
     }
 
-    public void setPropertyChangeListener(PropertyChangeListener listener) {
-        this.listener = listener;
+    public void setPropertyChangeListener(PropertyChangeListener l) {
+        this.listener = l;
     }
 
-    protected void firePropertyChanged(String name,Object oldValue, Object newValue){
+    protected void firePropertyChanged(String name, Object oldValue, Object newValue) {
         PropertyChangeListener l = listener;
-        if (l != null){
-            PropertyChangeEvent event = new PropertyChangeEvent(this,name,oldValue,newValue);
+        if (l != null) {
+            PropertyChangeEvent event = new PropertyChangeEvent(this, name, oldValue, newValue);
             l.propertyChange(event);
         }
     }
@@ -296,6 +302,8 @@
                 break;
             case ServiceUnitEvent.UNIT_SHUTDOWN:
                 listeners[i].unitShutDown(event);
+                break;
+            default:
                 break;
             }
         }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitMBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitMBean.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitMBean.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitMBean.java Fri Aug 10 07:37:46 2007
@@ -20,6 +20,12 @@
 
 public interface ServiceUnitMBean {
 
+    String STARTED = DeploymentServiceMBean.STARTED;
+
+    String SHUTDOWN = DeploymentServiceMBean.SHUTDOWN;
+
+    String STOPPED = DeploymentServiceMBean.STOPPED;
+
     String getName();
     
     String getDescription();
@@ -32,9 +38,4 @@
     
     String getDescriptor();
 
-    String STARTED = DeploymentServiceMBean.STARTED;
-
-    String SHUTDOWN = DeploymentServiceMBean.SHUTDOWN;
-
-    String STOPPED = DeploymentServiceMBean.STOPPED;
 }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SharedLibrary.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SharedLibrary.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SharedLibrary.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SharedLibrary.java Fri Aug 10 07:37:46 2007
@@ -84,7 +84,7 @@
                         parent, 
                         !parentFirst, 
                         new String[0], 
-                        new String[] { "java.", "javax." });
+                        new String[] {"java.", "javax." });
     }
 
     public String getDescription() {

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SharedLibraryMBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SharedLibraryMBean.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SharedLibraryMBean.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SharedLibraryMBean.java Fri Aug 10 07:37:46 2007
@@ -18,9 +18,9 @@
 
 public interface SharedLibraryMBean {
 
-    public String getName();
+    String getName();
     
-    public String getDescription();
+    String getDescription();
     
-    public String getVersion();
+    String getVersion();
 }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SubscriptionRegistry.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SubscriptionRegistry.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SubscriptionRegistry.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/SubscriptionRegistry.java Fri Aug 10 07:37:46 2007
@@ -16,17 +16,16 @@
  */
 package org.apache.servicemix.jbi.framework;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.servicemix.jbi.container.SubscriptionSpec;
 import org.apache.servicemix.jbi.messaging.MessageExchangeImpl;
 import org.apache.servicemix.jbi.servicedesc.InternalEndpoint;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Maintains a registry of the applicable subscriptions currently active for the
  * current components
@@ -69,7 +68,7 @@
             Map.Entry entry = (Map.Entry) iter.next();
 
             SubscriptionSpec subscription = (SubscriptionSpec) entry.getKey();
-            if (subscription.matches(registry,exchange)) {
+            if (subscription.matches(registry, exchange)) {
                 if (result == null) {
                     result = new ArrayList<InternalEndpoint>();
                 }

Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/support/SUDescriptorProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/support/SUDescriptorProcessor.java?view=diff&rev=564607&r1=564606&r2=564607
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/support/SUDescriptorProcessor.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/support/SUDescriptorProcessor.java Fri Aug 10 07:37:46 2007
@@ -31,12 +31,12 @@
  */
 public class SUDescriptorProcessor implements EndpointProcessor {
 
-    private static final Log logger = LogFactory.getLog(SUDescriptorProcessor.class);
+    private static final Log LOG = LogFactory.getLog(SUDescriptorProcessor.class);
     
     private Registry registry;
     
-    public void init(Registry registry) {
-        this.registry = registry;
+    public void init(Registry reg) {
+        this.registry = reg;
     }
 
     /**
@@ -52,12 +52,12 @@
                 Provides[] provides = services.getProvides();
                 if (provides != null) {
                     for (int j = 0; j < provides.length; j++) {
-                        if (provides[j].getInterfaceName() != null &&
-                            serviceEndpoint.getServiceName().equals(provides[j].getServiceName()) &&
-                            serviceEndpoint.getEndpointName().equals(provides[j].getEndpointName())) {
-                            if (logger.isDebugEnabled()) {
-                                logger.debug("Endpoint " + serviceEndpoint + " is provided by SU " + sus[i].getName());
-                                logger.debug("Endpoint " + serviceEndpoint + " implements interface " + provides[j].getInterfaceName());
+                        if (provides[j].getInterfaceName() != null
+                                && serviceEndpoint.getServiceName().equals(provides[j].getServiceName())
+                                && serviceEndpoint.getEndpointName().equals(provides[j].getEndpointName())) {
+                            if (LOG.isDebugEnabled()) {
+                                LOG.debug("Endpoint " + serviceEndpoint + " is provided by SU " + sus[i].getName());
+                                LOG.debug("Endpoint " + serviceEndpoint + " implements interface " + provides[j].getInterfaceName());
                             }
                             serviceEndpoint.addInterface(provides[j].getInterfaceName());
                         }



Mime
View raw message