You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/06/17 19:28:14 UTC
svn commit: r415032 [1/5] - in /incubator/tuscany/sandbox/jboynes/sca: ./
buildtools/src/main/resources/ core2/
core2/src/main/java/org/apache/tuscany/core/bootstrap/
core2/src/main/java/org/apache/tuscany/core/builder/
core2/src/main/java/org/apache/t...
Author: jmarino
Date: Sat Jun 17 10:28:07 2006
New Revision: 415032
URL: http://svn.apache.org/viewvc?rev=415032&view=rev
Log:
add checkstyle and pmd to core2; cosmetic changes to pass checkstyle and pmd tests
Added:
incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-suppressions.xml (with props)
incubator/tuscany/sandbox/jboynes/sca/core2/.pmd
incubator/tuscany/sandbox/jboynes/sca/core2/.ruleset
incubator/tuscany/sandbox/jboynes/sca/tuscany-suppressions.xml (with props)
Removed:
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/ChildLocateTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/tuscany-checkstyle.xml
Modified:
incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml
incubator/tuscany/sandbox/jboynes/sca/core2/pom.xml
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/CompositeComponentImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ScopeIdentifier.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractEvent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEvent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapper.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapperImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeContainer.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/deployer/DeployerImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ArrayMultiplicityObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ContextInjector.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/FieldInjector.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/injection/ListMultiplicityObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentTypeElementLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/JNDIPropertyFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StAXUtil.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/StringParserPropertyFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/PolicyBuilderRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncMonitor.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/workmanager/DefaultWorkManager.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponentImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReferenceImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemServiceImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemSingletonAtomicComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemBindingLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemComponentTypeLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemCompositeComponentTypeLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/loader/SystemImplementationLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemInboundWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemInboundWireImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemOutboundWire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/wire/SystemOutboundWireImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/util/JavaIntrospectionHelper.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/util/MethodHashMap.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/InboundInvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/InboundWireImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/InvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/InvokerInterceptor.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/MessageChannelImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/MessageDispatcher.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OutboundInvocationChainImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OutboundWireImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/PojoTargetInvoker.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/RequestResponseInterceptor.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/StaticPojoTargetInvoker.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKInboundInvocationHandler.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKOutboundInvocationHandler.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/jdk/JDKWireService.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/InboundtoOutboundConnectTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/builder/OutboundToInboundConnectTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/event/EventTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/AbstractScopeContainerTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicHttpSessionScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicModuleScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicRequestScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/BasicStatelessScopeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/DependencyLifecycleTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeInstanceLifecycleTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/HttpSessionScopeRestartTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeInstanceLifecycleTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/ModuleScopeRestartTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeInstanceLifecycleTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/RequestScopeRestartTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/component/scope/WorkContextTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/JNDIObjectFactoryTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/MethodEventInvokerTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/MethodInjectorTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/injection/SingletonObjectFactoryTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/SystemBuildersTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/ServiceLoaderTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/loader/StAXLoaderRegistryImplTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/AbstractGenericComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/BasicInterfaceImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/DataObject.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/GenericComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/HelloWorldClient.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/HelloWorldService.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/LocalComponentImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeComponentImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeDestroyOnlyComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeEagerInitDestroyComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitDestroyComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/ModuleScopeInitOnlyComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OrderedEagerInitPojo.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OrderedInitPojoImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/OtherTarget.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RemotableService.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RemotableServiceImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RequestScopeComponentImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RequestScopeDestroyOnlyComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RequestScopeInitDestroyComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RequestScopeInitOnlyComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/RequestScopedOrderedInitPojo.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeComponentImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeDestroyOnlyComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeInitDestroyComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopeInitOnlyComponent.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SessionScopedOrderedInitPojo.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SimpleSource.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SimpleTarget.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/Source.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/SourceImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/StatelessComponentImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/component/Target.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockComponentFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/factories/MockContextFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockHandler.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/mock/wire/MockStaticInvoker.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/DefaultWorkManagerTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/workmanager/GeronimoWorkManagerTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireResolutionTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemAtomicComponentTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/AtomicComponentWireInvocationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemOutboundToInboundTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/wire/SystemServiceComponentWireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean1.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/Bean2.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/JavaIntrospectionHelperTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/util/SuperBean.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/InboundInvocationErrorTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/MediationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/OutboundInvocationErrorTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/StaticPojoInvokerTestCase.java
incubator/tuscany/sandbox/jboynes/sca/pom.xml
incubator/tuscany/sandbox/jboynes/sca/spi/.ruleset
incubator/tuscany/sandbox/jboynes/sca/tuscany-checkstyle.xml
Modified: incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-checkstyle.xml Sat Jun 17 10:28:07 2006
@@ -28,10 +28,13 @@
-->
<module name="Checker">
+
+
<property name="severity"
value="${checkstyle.severity}"
default="warning"/>
+
<!-- Checks whether files end with a new line. -->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
<!--
@@ -88,10 +91,10 @@
<!-- defaults to sun.* packages -->
<module name="RedundantImport"/>
<module name="UnusedImports"/>
- <module name="ImportOrder">
- <property name="groups" value="java,javax,org.w3c,org.xml,w3c"/>
+ <!--<module name="ImportOrder">
+ <property name="groups" value="java,javax,org.w3c,org.xml,w3c,org.osoa"/>
<property name="ordered" value="true"/>
- </module>
+ </module>-->
<!--
<module name="ImportControl">
<property name="file" value="etc/import-control.xml"/>
@@ -116,7 +119,7 @@
<property name="countEmpty" value="false"/>
</module>
<module name="ParameterNumber">
- <property name="max" value="7"/>
+ <property name="max" value="15"/>
</module>
<!-- Checks for whitespace -->
@@ -179,7 +182,7 @@
<!--<module name="IllegalTokenText"/>-->
<!--<module name="InnerAssignment"/>-->
<!--<module name="MagicNumber"/>-->
- <module name="MissingSwitchDefault"/>
+ <!--<module name="MissingSwitchDefault"/>-->
<module name="ModifiedControlVariable"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
@@ -224,7 +227,7 @@
<module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/>
<module name="InterfaceIsType"/>
- <module name="MutableException"/>
+ <!--<module name="MutableException"/>-->
<module name="ThrowsCount">
<property name="max" value="5"/>
</module>
Added: incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-suppressions.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-suppressions.xml?rev=415032&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-suppressions.xml (added)
+++ incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-suppressions.xml Sat Jun 17 10:28:07 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+
+<suppressions>
+ <suppress checks="VisibilityModifier"
+ files="^.*TestCase$.java|BasicInterfaceImpl.java|Bean1.java|SuperBean.java"
+ />
+</suppressions>
\ No newline at end of file
Propchange: incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-suppressions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/buildtools/src/main/resources/tuscany-suppressions.xml
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Added: incubator/tuscany/sandbox/jboynes/sca/core2/.pmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/.pmd?rev=415032&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/.pmd (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/.pmd Sat Jun 17 10:28:07 2006
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/></pmd>
\ No newline at end of file
Added: incubator/tuscany/sandbox/jboynes/sca/core2/.ruleset
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/.ruleset?rev=415032&view=auto
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/.ruleset (added)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/.ruleset Sat Jun 17 10:28:07 2006
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="pmd-eclipse">
+ <description>PMD Plugin preferences rule set</description>
+
+
+ <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+ <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->
+ <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->
+<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->
+ <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>
+ <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+<!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->
+
+<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->
+<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->
+
+<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->
+<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->
+<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->
+
+<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
+<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->
+<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
+
+<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>
+<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->
+<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->
+<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->
+<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->
+<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->
+<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->
+<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->
+<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->
+
+<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->
+<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->
+<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->
+
+<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->
+<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->
+<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->
+<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>
+<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->
+<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->
+<!--<rule ref="rulesets/design.xml/BadComparison"/>-->
+<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->
+<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->
+<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->
+<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->
+<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->
+<rule ref="rulesets/design.xml/IdempotentOperations"/>
+<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->
+<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->
+<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->
+<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->
+<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->
+<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->
+<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+<rule ref="rulesets/design.xml/SimplifyConditional"/>
+<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->
+<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->
+<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
+<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->
+<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->
+<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->
+
+<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->
+<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->
+<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->
+
+<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->
+<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->
+<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->
+<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->
+
+<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->
+<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->
+
+<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->
+<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->
+<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->
+<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->
+<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->
+
+ <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->
+ <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->
+ <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->
+ <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->
+
+ <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
+ <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
+ <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->
+ <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->
+ <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->
+ <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->
+ <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->
+ <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->
+ <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->
+
+ <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->
+ <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->
+
+ <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->
+ <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->
+
+ <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->
+ <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->
+ <!--<rule ref="rulesets/strings.xml/StringToString"/>-->
+ <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->
+ <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->
+
+ <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->
+ <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->
+
+ <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
+ <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
+ <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
+
+</ruleset>
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/pom.xml?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/pom.xml Sat Jun 17 10:28:07 2006
@@ -102,5 +102,37 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <rulesets>
+ <ruleset>${basedir}/.ruleset</ruleset>
+ </rulesets>
+ <linkXRef>false</linkXRef>
+
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ <executions>
+ <execution>
+ <id>process-sources</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
</project>
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Sat Jun 17 10:28:07 2006
@@ -50,8 +50,7 @@
import org.apache.tuscany.spi.monitor.MonitorFactory;
/**
- * A Tuscany runtime bootstrapper responsible for instantiating the runtime with the default primordial
- * configuration
+ * A Tuscany runtime bootstrapper responsible for instantiating the runtime with the default primordial configuration
*
* @version $Rev$ $Date$
*/
@@ -60,7 +59,9 @@
private final LoaderRegistry loaderRegistry;
private final Connector connector;
- public DefaultBootstrapper(LoaderRegistry loaderRegistry, BuilderRegistry builderRegistry, Connector connector) {
+ public DefaultBootstrapper(LoaderRegistry loaderRegistry,
+ BuilderRegistry builderRegistry,
+ Connector connector) {
this.builderRegistry = builderRegistry;
this.loaderRegistry = loaderRegistry;
this.connector = connector;
@@ -80,38 +81,46 @@
return deployer;
}
- protected BuilderRegistry getDefaultBuilderRegistry() {
+ private BuilderRegistry getDefaultBuilderRegistry() {
ScopeRegistry scopeRegistry = new ScopeRegistryImpl(new WorkContextImpl());
BuilderRegistry builderRegistry = new BuilderRegistryImpl(scopeRegistry);
- builderRegistry.register(SystemCompositeImplementation.class, new SystemCompositeBuilder(builderRegistry));
+ builderRegistry.register(SystemCompositeImplementation.class,
+ new SystemCompositeBuilder(builderRegistry));
builderRegistry.register(SystemImplementation.class, new SystemComponentBuilder());
builderRegistry.register(SystemBinding.class, new SystemBindingBuilder());
return builderRegistry;
}
- protected LoaderRegistry getDefaultLoaderRegistry(MonitorFactory monitorFactory, StAXPropertyFactory propertyFactory) {
+ private LoaderRegistry getDefaultLoaderRegistry(MonitorFactory monitorFactory,
+ StAXPropertyFactory propertyFactory) {
LoaderRegistryImpl loaderRegistry = new LoaderRegistryImpl();
loaderRegistry.setMonitor(monitorFactory.getMonitor(LoaderRegistryImpl.Monitor.class));
// register component type loaders
loaderRegistry.registerLoader(SystemImplementation.class, new SystemComponentTypeLoader());
- loaderRegistry.registerLoader(SystemCompositeImplementation.class, new SystemCompositeComponentTypeLoader(loaderRegistry));
+ loaderRegistry.registerLoader(SystemCompositeImplementation.class,
+ new SystemCompositeComponentTypeLoader(loaderRegistry));
// register element loaders
- loaderRegistry.registerLoader(AssemblyConstants.COMPONENT, new ComponentLoader(loaderRegistry, propertyFactory));
- loaderRegistry.registerLoader(AssemblyConstants.COMPONENT_TYPE, new ComponentTypeElementLoader(loaderRegistry));
+ loaderRegistry.registerLoader(AssemblyConstants.COMPONENT, new ComponentLoader(loaderRegistry,
+ propertyFactory));
+ loaderRegistry.registerLoader(AssemblyConstants.COMPONENT_TYPE,
+ new ComponentTypeElementLoader(loaderRegistry));
loaderRegistry.registerLoader(AssemblyConstants.COMPOSITE, new CompositeLoader(loaderRegistry));
- loaderRegistry.registerLoader(AssemblyConstants.INTERFACE_JAVA, new InterfaceJavaLoader(loaderRegistry));
+ loaderRegistry.registerLoader(AssemblyConstants.INTERFACE_JAVA,
+ new InterfaceJavaLoader(loaderRegistry));
loaderRegistry.registerLoader(AssemblyConstants.PROPERTY, new PropertyLoader(loaderRegistry));
loaderRegistry.registerLoader(AssemblyConstants.REFERENCE, new ReferenceLoader(loaderRegistry));
loaderRegistry.registerLoader(AssemblyConstants.SERVICE, new ServiceLoader(loaderRegistry));
- loaderRegistry.registerLoader(SystemImplementationLoader.SYSTEM_IMPLEMENTATION, new SystemImplementationLoader(loaderRegistry));
- loaderRegistry.registerLoader(SystemBindingLoader.SYSTEM_BINDING, new SystemBindingLoader(loaderRegistry));
+ loaderRegistry.registerLoader(SystemImplementationLoader.SYSTEM_IMPLEMENTATION,
+ new SystemImplementationLoader(loaderRegistry));
+ loaderRegistry.registerLoader(SystemBindingLoader.SYSTEM_BINDING,
+ new SystemBindingLoader(loaderRegistry));
return loaderRegistry;
}
- protected Connector getDefaultConnector() {
+ private Connector getDefaultConnector() {
return new ConnectorImpl();
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/bootstrap/DefaultRuntime.java Sat Jun 17 10:28:07 2006
@@ -28,7 +28,8 @@
*
* @version $Rev$ $Date$
*/
-public class DefaultRuntime extends SystemCompositeComponentImpl<Void> implements RuntimeComponent<SystemCompositeComponent> {
+public class DefaultRuntime extends SystemCompositeComponentImpl<Void>
+ implements RuntimeComponent<SystemCompositeComponent> {
private final CompositeComponent rootComponent;
private final SystemCompositeComponent systemContext;
private final Deployer deployer;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Sat Jun 17 10:28:07 2006
@@ -36,6 +36,7 @@
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.ComponentType;
import org.apache.tuscany.spi.model.Implementation;
/**
@@ -44,12 +45,17 @@
* @version $Rev$ $Date$
*/
public class BuilderRegistryImpl implements BuilderRegistry {
- private final Map<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>> componentBuilders = new HashMap<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>>();
- private final Map<Class<? extends Binding>, BindingBuilder<? extends Binding>> bindingBuilders = new HashMap<Class<? extends Binding>, BindingBuilder<? extends Binding>>();
//protected WireService wireService;
protected ScopeRegistry scopeRegistry;
+ private final Map<Class<? extends Implementation<?>>,
+ ComponentBuilder<? extends Implementation<?>>> componentBuilders =
+ new HashMap<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>>();
+ private final Map<Class<? extends Binding>,
+ BindingBuilder<? extends Binding>> bindingBuilders =
+ new HashMap<Class<? extends Binding>, BindingBuilder<? extends Binding>>();
+
public BuilderRegistryImpl() {
}
@@ -80,7 +86,9 @@
}
@SuppressWarnings("unchecked")
- public <I extends Implementation<?>> Component<?> build(CompositeComponent<?> parent, ComponentDefinition<I> componentDefinition, DeploymentContext deploymentContext) {
+ public <I extends Implementation<?>> Component<?> build(CompositeComponent<?> parent,
+ ComponentDefinition<I> componentDefinition,
+ DeploymentContext deploymentContext) {
Class<I> implClass = (Class<I>) componentDefinition.getImplementation().getClass();
ComponentBuilder<I> componentBuilder = (ComponentBuilder<I>) componentBuilders.get(implClass);
if (componentBuilder == null) {
@@ -91,14 +99,15 @@
}
Component<?> context = componentBuilder.build(parent, componentDefinition, deploymentContext);
- assert(componentDefinition.getImplementation().getComponentType() != null): "ComponentDefinition type must be set";
+ ComponentType componentType = componentDefinition.getImplementation().getComponentType();
+ assert componentType != null : "ComponentDefinition type must be set";
return context;
}
public <B extends Binding> void register(BindingBuilder<B> builder) {
Type[] interfaces = builder.getClass().getGenericInterfaces();
for (Type type : interfaces) {
- if (! (type instanceof ParameterizedType)) {
+ if (!(type instanceof ParameterizedType)) {
continue;
}
ParameterizedType interfaceType = (ParameterizedType) type;
@@ -117,14 +126,18 @@
}
@SuppressWarnings("unchecked")
- public <B extends Binding> SCAObject build(CompositeComponent parent, BoundServiceDefinition<B> boundServiceDefinition, DeploymentContext deploymentContext) {
+ public <B extends Binding> SCAObject build(CompositeComponent parent,
+ BoundServiceDefinition<B> boundServiceDefinition,
+ DeploymentContext deploymentContext) {
Class<B> bindingClass = (Class<B>) boundServiceDefinition.getBinding().getClass();
BindingBuilder<B> bindingBuilder = (BindingBuilder<B>) bindingBuilders.get(bindingClass);
return bindingBuilder.build(parent, boundServiceDefinition, deploymentContext);
}
@SuppressWarnings("unchecked")
- public <B extends Binding> SCAObject build(CompositeComponent parent, BoundReferenceDefinition<B> boundReferenceDefinition, DeploymentContext deploymentContext) {
+ public <B extends Binding> SCAObject build(CompositeComponent parent,
+ BoundReferenceDefinition<B> boundReferenceDefinition,
+ DeploymentContext deploymentContext) {
Class<B> bindingClass = (Class<B>) boundReferenceDefinition.getBinding().getClass();
BindingBuilder<B> bindingBuilder = (BindingBuilder<B>) bindingBuilders.get(bindingClass);
return bindingBuilder.build(parent, boundReferenceDefinition, deploymentContext);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/Connector.java Sat Jun 17 10:28:07 2006
@@ -8,8 +8,7 @@
import org.apache.tuscany.spi.wire.OutboundWire;
/**
- * Implementations are responsible for bridging invocation chains as an assembly is converted to runtime
- * artifacts
+ * Implementations are responsible for bridging invocation chains as an assembly is converted to runtime artifacts
*
* @version $$Rev$$ $$Date$$
*/
@@ -17,9 +16,11 @@
<T> void connect(SCAObject<T> source);
- <T> void connect(InboundWire<T> inboundWire, OutboundWire<T> outboundWire, boolean optimizable) throws BuilderConfigException;
+ <T> void connect(InboundWire<T> inboundWire, OutboundWire<T> outboundWire, boolean optimizable)
+ throws BuilderConfigException;
- <T> void connect(OutboundWire<T> outboundWire, CompositeComponent<?> parent, Scope sourceScope) throws BuilderConfigException;
+ <T> void connect(OutboundWire<T> outboundWire, CompositeComponent<?> parent, Scope sourceScope)
+ throws BuilderConfigException;
<T> void connect(OutboundWire<T> sourceWire, InboundWire<T> targetWire, SCAObject<?> context, boolean optimizable);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Sat Jun 17 10:28:07 2006
@@ -61,13 +61,16 @@
}
@SuppressWarnings("unchecked")
- public <T> void connect(OutboundWire<T> sourceWire, CompositeComponent<?> parent, Scope sourceScope) throws BuilderConfigException {
- assert(sourceScope != null): "Source scope was null";
- assert(sourceWire.getTargetName() != null): "WireDefinition target name was null";
+ public <T> void connect(OutboundWire<T> sourceWire,
+ CompositeComponent<?> parent,
+ Scope sourceScope) throws BuilderConfigException {
+ assert sourceScope != null : "Source scope was null";
+ assert sourceWire.getTargetName() != null : "WireDefinition target name was null";
QualifiedName targetName = sourceWire.getTargetName();
SCAObject<?> target = parent.getChild(targetName.getPartName());
if (target == null) {
- BuilderConfigException e = new BuilderConfigException("Target not found for reference" + sourceWire.getReferenceName());
+ BuilderConfigException e = new BuilderConfigException("Target not found for reference"
+ + sourceWire.getReferenceName());
e.setIdentifier(targetName.getQualifiedName());
throw e;
}
@@ -76,7 +79,8 @@
AtomicComponent<?> targetComponent = (AtomicComponent<?>) target;
InboundWire<T> targetWire = targetComponent.getInboundWire(targetName.getPortName());
if (targetWire == null) {
- BuilderConfigException e = new BuilderConfigException("Target service not found for reference " + sourceWire.getReferenceName());
+ BuilderConfigException e = new BuilderConfigException("Target service not found for reference "
+ + sourceWire.getReferenceName());
e.setIdentifier(targetName.getPortName());
throw e;
}
@@ -86,18 +90,21 @@
connect(sourceWire, targetWire, target, isOptimizable(sourceScope, target.getScope()));
} else if (target instanceof Reference) {
InboundWire<T> targetWire = ((Reference) target).getInboundWire();
- assert(targetWire != null);
+ assert targetWire != null;
if (!sourceWire.getBusinessInterface().isAssignableFrom(targetWire.getBusinessInterface())) {
throw new BuilderConfigException("Incompatible source and target interfaces");
}
connect(sourceWire, targetWire, target, isOptimizable(sourceScope, target.getScope()));
} else {
- BuilderConfigException e = new BuilderConfigException("Invalid wire target type for reference " + sourceWire.getReferenceName());
+ BuilderConfigException e = new BuilderConfigException("Invalid wire target type for reference "
+ + sourceWire.getReferenceName());
e.setIdentifier(targetName.getQualifiedName());
}
}
- public <T> void connect(InboundWire<T> sourceWire, OutboundWire<T> targetWire, boolean optimizable) throws BuilderConfigException {
+ public <T> void connect(InboundWire<T> sourceWire,
+ OutboundWire<T> targetWire,
+ boolean optimizable) throws BuilderConfigException {
Map<Method, OutboundInvocationChain> targetChains = targetWire.getInvocationChains();
// perform optimization, if possible
if (optimizable && sourceWire.getInvocationChains().isEmpty() && targetChains.isEmpty()) {
@@ -117,7 +124,10 @@
}
}
- public <T> void connect(OutboundWire<T> sourceWire, InboundWire<T> targetWire, SCAObject<?> context, boolean optimizable) {
+ public <T> void connect(OutboundWire<T> sourceWire,
+ InboundWire<T> targetWire,
+ SCAObject<?> context,
+ boolean optimizable) {
Map<Method, InboundInvocationChain> targetChains = targetWire.getInvocationChains();
// perform optimization, if possible
if (optimizable && sourceWire.getInvocationChains().isEmpty() && targetChains.isEmpty()) {
@@ -128,19 +138,28 @@
// match wire chains
InboundInvocationChain inboundChain = targetChains.get(outboundChain.getMethod());
if (inboundChain == null) {
- BuilderConfigException e = new BuilderConfigException("Incompatible sourceWire and target chain interfaces for reference");
+ BuilderConfigException e =
+ new BuilderConfigException("Incompatible source and target chain interfaces for reference");
e.setIdentifier(sourceWire.getReferenceName());
throw e;
}
if (context instanceof Component) {
- connect(outboundChain, inboundChain, ((Component) context).createTargetInvoker(targetWire.getServiceName(), inboundChain.getMethod()));
+ connect(outboundChain,
+ inboundChain,
+ ((Component) context).createTargetInvoker(targetWire.getServiceName(),
+ inboundChain.getMethod()));
} else if (context instanceof Reference) {
- connect(outboundChain, inboundChain, ((Reference) context).createTargetInvoker(targetWire.getServiceName(), inboundChain.getMethod()));
+ Reference reference = (Reference) context;
+ TargetInvoker invoker = reference.createTargetInvoker(targetWire.getServiceName(),
+ inboundChain.getMethod());
+ connect(outboundChain, inboundChain, invoker);
}
}
}
- public void connect(OutboundInvocationChain sourceChain, InboundInvocationChain targetChain, TargetInvoker invoker) {
+ public void connect(OutboundInvocationChain sourceChain,
+ InboundInvocationChain targetChain,
+ TargetInvoker invoker) {
// if handlers are configured, add them
if (targetChain.getRequestHandlers() != null || targetChain.getResponseHandlers() != null) {
if (targetChain.getRequestHandlers() == null) {
@@ -167,7 +186,7 @@
throw e;
}
if (!(sourceChain.getTailInterceptor() instanceof InvokerInterceptor && targetChain
- .getHeadInterceptor() instanceof InvokerInterceptor)) {
+ .getHeadInterceptor() instanceof InvokerInterceptor)) {
// check that we do not have the case where the only interceptors are invokers since we just need one
sourceChain.setTargetInterceptor(targetChain.getHeadInterceptor());
}
@@ -205,7 +224,9 @@
} else if (pReferrer == Scope.COMPOSITE && pReferee == Scope.MODULE) {
// case where a service context points to a module scoped component
return true;
- } else return pReferrer == Scope.MODULE && pReferee == Scope.COMPOSITE;
+ } else {
+ return pReferrer == Scope.MODULE && pReferee == Scope.COMPOSITE;
+ }
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AbstractCompositeComponent.java Sat Jun 17 10:28:07 2006
@@ -28,8 +28,12 @@
*
* @version $Rev$ $Date$
*/
-@SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized", "RawUseOfParameterizedType", "NonPrivateFieldAccessedInSynchronizedContext"})
-public abstract class AbstractCompositeComponent<T> extends CompositeComponentExtension<T> implements AutowireComponent<T> {
+@SuppressWarnings({
+ "FieldAccessedSynchronizedAndUnsynchronized",
+ "RawUseOfParameterizedType",
+ "NonPrivateFieldAccessedInSynchronizedContext"})
+public abstract class AbstractCompositeComponent<T> extends CompositeComponentExtension<T>
+ implements AutowireComponent<T> {
public static final int DEFAULT_WAIT = 1000 * 60;
@@ -49,7 +53,10 @@
protected ScopeContainer scopeContainer;
- public AbstractCompositeComponent(String name, CompositeComponent parent, AutowireComponent autowireContext, WireService wireService) {
+ public AbstractCompositeComponent(String name,
+ CompositeComponent parent,
+ AutowireComponent autowireContext,
+ WireService wireService) {
super(name, parent, wireService);
this.autowireContext = autowireContext;
}
@@ -147,10 +154,11 @@
if (context != null) {
try {
if (context instanceof AtomicComponent || context instanceof Reference
- || context instanceof SystemService) {
+ || context instanceof SystemService) {
return instanceInterface.cast(context.getServiceInstance());
} else {
- IllegalTargetException e = new IllegalTargetException("Autowire target must be a system service, atomic, or reference context");
+ IllegalTargetException e = new IllegalTargetException("Autowire target must be a system "
+ + "service, atomic component, or reference");
e.setIdentifier(instanceInterface.getName());
e.addContextName(getName());
throw e;
@@ -187,7 +195,7 @@
}
public TargetInvoker createTargetInvoker(String serviceName, Method operation) {
- return null;// new BridgingInvoker(serviceName, operation, this);
+ return null;
}
protected void registerAutowireExternal(Class<?> interfaze, SystemService context) {
@@ -199,7 +207,7 @@
}
protected void registerAutowireInternal(Class<?> interfaze, SCAObject context) {
- assert interfaze != null: "Interface was null";
+ assert interfaze != null : "Interface was null";
if (autowireInternal.containsKey(interfaze)) {
return;
}
@@ -238,7 +246,8 @@
if (!initialized) {
try {
/* block until the module has initialized */
- boolean success = initializeLatch.await(AbstractCompositeComponent.DEFAULT_WAIT, TimeUnit.MILLISECONDS);
+ boolean success = initializeLatch.await(AbstractCompositeComponent.DEFAULT_WAIT,
+ TimeUnit.MILLISECONDS);
if (!success) {
throw new ComponentInitException("Timeout waiting for context to initialize");
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireComponent.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/AutowireComponent.java Sat Jun 17 10:28:07 2006
@@ -17,16 +17,16 @@
/**
- * A specialization of a CompositeComponent that is able to automatically resolve references for its children
- * using service interfaces exposed by it or, recursively, any of it parents.
+ * A specialization of a CompositeComponent that is able to automatically resolve references for its children using
+ * service interfaces exposed by it or, recursively, any of it parents.
*
* @version $Rev$ $Date$
*/
public interface AutowireComponent<S> extends CompositeComponent<S> {
/**
- * Invoked by child components to return an an autowire target. Resolved targets may be services or
- * components in the parent or its ancestors, or references in a sibling component
+ * Invoked by child components to return an an autowire target. Resolved targets may be services or components in
+ * the parent or its ancestors, or references in a sibling component
*
* @param instanceInterface the type of service being requested
* @return a reference to the requested service or null if none can be found
@@ -35,10 +35,10 @@
<T> T resolveInstance(Class<T> instanceInterface) throws AutowireResolutionException;
/**
- * Invoked by a parent component to return an autowire target in a child. Resolved targets must be
- * services. For example, given a parent P and two siblings, A and B, A would request an autowire by
- * invoking {@link #resolveInstance(Class<T>)} on P, which in turn could invoke the present method on B in
- * order to resolve a target.
+ * Invoked by a parent component to return an autowire target in a child. Resolved targets must be services. For
+ * example, given a parent P and two siblings, A and B, A would request an autowire by invoking {@link
+ * #resolveInstance(Class<T>)} on P, which in turn could invoke the present method on B in order to resolve a
+ * target.
*
* @param instanceInterface the type of service being requested
* @return a reference to the requested service or null if none can be found
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/CompositeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/CompositeComponentImpl.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/CompositeComponentImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/CompositeComponentImpl.java Sat Jun 17 10:28:07 2006
@@ -1,5 +1,7 @@
package org.apache.tuscany.core.component;
+import org.osoa.sca.ServiceUnavailableException;
+
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -8,21 +10,21 @@
import org.apache.tuscany.spi.component.Service;
import org.apache.tuscany.spi.component.TargetException;
import org.apache.tuscany.spi.wire.WireService;
-import org.osoa.sca.ServiceUnavailableException;
/**
- * The standard implementation of a composite component. Autowiring is performed by delegating to the parent
- * composite.
+ * The standard implementation of a composite component. Autowiring is performed by delegating to the parent composite.
*
* @version $Rev$ $Date$
*/
public class CompositeComponentImpl<T> extends AbstractCompositeComponent<T> {
+ private String uri;
- public CompositeComponentImpl(String name, CompositeComponent parent, AutowireComponent autowireContext, WireService wireService) {
+ public CompositeComponentImpl(String name,
+ CompositeComponent parent,
+ AutowireComponent autowireContext,
+ WireService wireService) {
super(name, parent, autowireContext, wireService);
}
-
- private String uri;
public String getURI() {
return uri;
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/PojoAtomicComponent.java Sat Jun 17 10:28:07 2006
@@ -19,7 +19,6 @@
import org.apache.tuscany.core.injection.WireObjectFactory;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.TargetException;
@@ -28,7 +27,7 @@
import org.apache.tuscany.spi.wire.WireService;
/**
- * Base implementation of an {@link AtomicComponent} whose type is a Java class
+ * Base implementation of an {@link org.apache.tuscany.spi.component.AtomicComponent} whose type is a Java class
*
* @version $$Rev$$ $$Date$$
*/
@@ -54,7 +53,7 @@
Map<String, Member> members,
WireService wireService) {
super(name, parent, scopeContainer, wireService);
- assert (objectFactory != null) : "Object factory was null";
+ assert objectFactory != null : "Object factory was null";
if (eagerInit && initInvoker == null) {
throw new AssertionError("No intialization method found for eager init implementation");
}
@@ -82,7 +81,7 @@
Map<String, Member> members,
WireService wireService) {
super(name, parent, scopeContainer, wireService);
- assert (objectFactory != null) : "Object factory was null";
+ assert objectFactory != null : "Object factory was null";
if (eagerInit && initInvoker == null) {
throw new AssertionError("No intialization method found for eager init implementation");
}
@@ -140,7 +139,7 @@
}
public void onReferenceWires(Class<?> multiplicityClass, List<OutboundWire> wires) {
- assert(wires.size() > 0): "Wires were empty";
+ assert wires.size() > 0 : "Wires were empty";
String referenceName = wires.get(0).getReferenceName();
Member member = members.get(referenceName);
if (member == null) {
@@ -152,9 +151,9 @@
protected Injector createInjector(Member member, OutboundWire wire) {
ObjectFactory<?> factory = new WireObjectFactory(wire, wireService);
if (member instanceof Field) {
- return new FieldInjector(((Field) member), factory);
+ return new FieldInjector((Field) member, factory);
} else if (member instanceof Method) {
- return new MethodInjector(((Method) member), factory);
+ return new MethodInjector((Method) member, factory);
} else {
InvalidAccessorException e = new InvalidAccessorException("Member must be a field or method");
e.setIdentifier(member.getName());
@@ -162,7 +161,9 @@
}
}
- protected Injector createMultiplicityInjector(Member member, Class<?> interfaceType, List<OutboundWire> wireFactories) {
+ protected Injector createMultiplicityInjector(Member member,
+ Class<?> interfaceType,
+ List<OutboundWire> wireFactories) {
List<ObjectFactory<?>> factories = new ArrayList<ObjectFactory<?>>();
for (OutboundWire wire : wireFactories) {
factories.add(new WireObjectFactory(wire, wireService));
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ScopeIdentifier.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ScopeIdentifier.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ScopeIdentifier.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/ScopeIdentifier.java Sat Jun 17 10:28:07 2006
@@ -1,9 +1,9 @@
package org.apache.tuscany.core.component;
/**
- * Implementations enable lazy retrieval of a scope id associated with a request, i.e. an id (and presumably a
- * context) do not have to be generated if the scope is never accessed. Identifiers are associated with the
- * current request thread and keyed on scope type.
+ * Implementations enable lazy retrieval of a scope id associated with a request, i.e. an id (and presumably a context)
+ * do not have to be generated if the scope is never accessed. Identifiers are associated with the current request
+ * thread and keyed on scope type.
*
* @version $Rev$ $Date$
* @see org.apache.tuscany.spi.component.WorkContext
@@ -13,5 +13,5 @@
/**
* Returns the scope id for the request.
*/
- public Object getIdentifier();
+ Object getIdentifier();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/WorkContextImpl.java Sat Jun 17 10:28:07 2006
@@ -17,12 +17,15 @@
private static final Object REMOTE_CONTEXT = new Object();
// TODO implement propagation strategy for creating new threads
- /*
- * a map ( associated with the current thread) of scope identifiers keyed on the event context id type. the scope identifier
- * may be a {@link ScopeIdentifier} or an opaque id
- */
+
+ //A map ( associated with the current thread) of scope identifiers keyed on the event context id type.
+ //The scope identifier may be a {@link ScopeIdentifier} or an opaque id
private ThreadLocal<Map<Object, Object>> workContext = new InheritableThreadLocal<Map<Object, Object>>();
+ public WorkContextImpl() {
+ super();
+ }
+
public CompositeComponent getRemoteComponent() {
Map<Object, Object> map = workContext.get();
if (map == null) {
@@ -76,10 +79,6 @@
public void clearIdentifiers() {
workContext.remove();
- }
-
- public WorkContextImpl() {
- super();
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractEvent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractEvent.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/AbstractEvent.java Sat Jun 17 10:28:07 2006
@@ -12,7 +12,7 @@
protected transient Object source;
public AbstractEvent(Object source) {
- assert (source != null): "Source id was null";
+ assert source != null : "Source id was null";
this.source = source;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeEvent.java Sat Jun 17 10:28:07 2006
@@ -10,6 +10,6 @@
*/
public interface CompositeEvent extends Event {
- public CompositeComponent getComposite();
+ CompositeComponent getComposite();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStart.java Sat Jun 17 10:28:07 2006
@@ -14,8 +14,8 @@
/**
* Creates a module stop event
*
- * @param source the source of the event
- * @param component the composite component associated the module being stopped
+ * @param source the source of the event
+ * @param component the composite component associated the module being stopped
*/
public CompositeStart(Object source, CompositeComponent component) {
super(source);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/CompositeStop.java Sat Jun 17 10:28:07 2006
@@ -14,8 +14,8 @@
/**
* Creates a module stop event
*
- * @param source the source of the event
- * @param component the composite component associated the module being stopped
+ * @param source the source of the event
+ * @param component the composite component associated the module being stopped
*/
public CompositeStop(Object source, CompositeComponent component) {
super(source);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEvent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEvent.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEvent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/event/HttpSessionEvent.java Sat Jun 17 10:28:07 2006
@@ -24,7 +24,7 @@
public HttpSessionEvent(Object source, Object id) {
super(source);
- assert (id != null): "Session id was null";
+ assert id != null : "Session id was null";
this.id = id;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java Sat Jun 17 10:28:07 2006
@@ -22,11 +22,12 @@
* @version $Rev$ $Date$
*/
public abstract class AbstractScopeContainer extends AbstractLifecycle implements ScopeContainer {
- private final String name;
+ private static final EventFilter TRUE_FILTER = new TrueFilter();
+
// The event context the scope container is associated with
protected WorkContext workContext;
+ private final String name;
private Map<EventFilter, List<RuntimeEventListener>> listeners;
- private static final EventFilter TRUE_FILTER = new TrueFilter();
public AbstractScopeContainer(String name, WorkContext workContext) {
this.name = name;
@@ -46,7 +47,7 @@
}
public void removeListener(RuntimeEventListener listener) {
- assert (listener != null) : "Listener cannot be null";
+ assert listener != null : "Listener cannot be null";
synchronized (getListeners()) {
for (List<RuntimeEventListener> currentList : getListeners().values()) {
for (RuntimeEventListener current : currentList) {
@@ -60,7 +61,7 @@
}
public void addListener(EventFilter filter, RuntimeEventListener listener) {
- assert (listener != null) : "Listener cannot be null";
+ assert listener != null : "Listener cannot be null";
synchronized (getListeners()) {
List<RuntimeEventListener> list = getListeners().get(filter);
if (list == null) {
@@ -72,7 +73,7 @@
}
public void publish(Event event) {
- assert(event != null): "Event object was null";
+ assert event != null : "Event object was null";
for (Map.Entry<EventFilter, List<RuntimeEventListener>> entry : getListeners().entrySet()) {
if (entry.getKey().match(event)) {
for (RuntimeEventListener listener : entry.getValue()) {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java Sat Jun 17 10:28:07 2006
@@ -77,7 +77,7 @@
protected InstanceWrapper getInstanceWrapper(AtomicComponent component) throws TargetException {
Object key = workContext.getIdentifier(HTTP_IDENTIFIER);
- assert(key != null):"HTTP session key not bound in work component";
+ assert key != null : "HTTP session key not bound in work component";
return getInstance(component, key);
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapper.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapper.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapper.java Sat Jun 17 10:28:07 2006
@@ -19,8 +19,9 @@
import org.apache.tuscany.spi.Lifecycle;
/**
- * Provides lifecycle management for an implementation instance associated with an {@link org.apache.tuscany.spi.component.AtomicComponent} for
- * use by the atomic context's associated {@link org.apache.tuscany.spi.component.ScopeContainer}
+ * Provides lifecycle management for an implementation instance associated with an {@link
+ * org.apache.tuscany.spi.component.AtomicComponent} for use by the atomic context's associated {@link
+ * org.apache.tuscany.spi.component.ScopeContainer}
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapperImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapperImpl.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapperImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/InstanceWrapperImpl.java Sat Jun 17 10:28:07 2006
@@ -28,8 +28,8 @@
private AtomicComponent component;
public InstanceWrapperImpl(AtomicComponent component, Object instance) {
- assert(component != null);
- assert(instance != null);
+ assert component != null;
+ assert instance != null;
this.component = component;
this.instance = instance;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java?rev=415032&r1=415031&r2=415032&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeContainer.java Sat Jun 17 10:28:07 2006
@@ -23,10 +23,10 @@
*/
public class ModuleScopeContainer extends AbstractScopeContainer {
+ private static final InstanceWrapper EMPTY = new EmptyWrapper();
private final Map<AtomicComponent, InstanceWrapper> instanceContexts;
// the queue of instanceContexts to destroy, in the order that their instances were created
private final List<InstanceWrapper> destroyQueue;
- private static final InstanceWrapper EMPTY = new EmptyWrapper();
public ModuleScopeContainer() {
this(null);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org