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/03 08:30:32 UTC
svn commit: r411390 [1/2] - in /incubator/tuscany/sandbox/jboynes/sca:
containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/
containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/
containers/container.ja...
Author: jmarino
Date: Fri Jun 2 23:30:28 2006
New Revision: 411390
URL: http://svn.apache.org/viewvc?rev=411390&view=rev
Log:
a lot of javadoc additions;method rename
Added:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeBuilder.java (contents, props changed)
- copied, changed from r411384, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/builder/CompositeBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java (contents, props changed)
- copied, changed from r411384, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/loader/CompositeLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireResolutionTestCase.java (contents, props changed)
- copied, changed from r411384, incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentTestCase.java
Removed:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/InvalidServiceTypeException.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/builder/CompositeBuilder.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/loader/CompositeLoader.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeComponentTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/UnknownTargetTypeException.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicComponent.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/DifferentInterfaceWireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaComponentBuilderTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/ReferenceInjectionTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ReferenceInvocationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java
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/component/AbstractCompositeComponent.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/scope/HttpSessionScopeObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.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/component/scope/StatelessScopeObjectFactory.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/AssemblyConstants.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/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/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/model/PojoComponentType.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/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/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/ObjectRegistrationException.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/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/model/SystemCompositeImplementation.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/SystemOutboundAutowire.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/wire/OutboundAutowire.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/OutboundInvocationChainImpl.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/ModuleScopeRestartTestCase.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/ScopeRegistryTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/deployer/BootstrapDeployerTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/integration/system/builder/AutowireBuilderTestcase.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/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/wsdl/WSDLDefinitionRegistryTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/AutowireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/DuplicateRegistrationTestCase.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/component/SystemCompositeComponentResolutionTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemCompositeLifecycleTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/component/SystemObjectRegistrationTestCase.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/SystemServiceComponentWireTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/JDKInboundInvocationHandlerTestCase.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/WireOptimizationTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/Lifecycle.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeRuntimeException.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/component/WorkContext.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ReferenceExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/extension/ServiceExtension.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/AtomicImplementation.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Binding.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundReferenceDefinition.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/BoundServiceDefinition.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentDefinition.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/CompositeImplementation.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Implementation.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/InteractionScope.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/JavaServiceContract.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ModelObject.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Property.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/PropertyValue.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceDefinition.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ReferenceTarget.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceContract.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/ServiceDefinition.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WSDLServiceContract.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/model/WireDefinition.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/services/wsdl/WSDLDefinitionRegistry.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/RuntimeWire.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/TargetInvoker.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireService.java
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java Fri Jun 2 23:30:28 2006
@@ -103,7 +103,7 @@
}
@SuppressWarnings("unchecked")
- public T getService() throws TargetException {
+ public T getServiceInstance() throws TargetException {
//TODO this should return a default service from a wire
return (T) getTargetInstance();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/PropertyTestCase.java Fri Jun 2 23:30:28 2006
@@ -36,7 +36,7 @@
GroovyAtomicComponent<Greeting> context = new GroovyAtomicComponent<Greeting>("source", PropertyTestCase.SCRIPT,
services, Scope.MODULE, injectors, null, scope, ArtifactFactory.createWireService());
scope.register(context);
- Greeting greeting = context.getService();
+ Greeting greeting = context.getServiceInstance();
assertEquals("bar", greeting.greet("foo"));
scope.stop();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java Fri Jun 2 23:30:28 2006
@@ -28,7 +28,7 @@
GroovyAtomicComponent<GroovyObject> context = new GroovyAtomicComponent<GroovyObject>("source", script2,
services, Scope.MODULE, null, null,scope, ArtifactFactory.createWireService());
scope.register(context);
- GroovyObject object = context.getService();
+ GroovyObject object = context.getServiceInstance();
assertEquals("foo", object.invokeMethod("greet", "foo"));
scope.stop();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java Fri Jun 2 23:30:28 2006
@@ -76,7 +76,7 @@
}
scope.register(context);
context.addOutboundWire(wire);
- Greeting greeting = context.getService();
+ Greeting greeting = context.getServiceInstance();
assertEquals("foo", greeting.greet("foo"));
scope.stop();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicComponent.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/JavaAtomicComponent.java Fri Jun 2 23:30:28 2006
@@ -67,7 +67,7 @@
return wireService.createProxy(wire);
}
- public T getService() throws TargetException {
+ public T getServiceInstance() throws TargetException {
if (serviceInterfaces.size() == 0) {
return getTargetInstance();
} else if (serviceInterfaces.size() == 1) {
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/DifferentInterfaceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/DifferentInterfaceWireTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/DifferentInterfaceWireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/DifferentInterfaceWireTestCase.java Fri Jun 2 23:30:28 2006
@@ -48,7 +48,7 @@
Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class, Target.class, scope,
members, "target", OtherTarget.class, OtherTargetImpl.class, scope);
AtomicComponent sourceComponent = contexts.get("source");
- Source source = (Source) sourceComponent.getService();
+ Source source = (Source) sourceComponent.getServiceInstance();
Target target = source.getTarget();
assertTrue(Proxy.isProxyClass(target.getClass()));
assertNotNull(target);
@@ -64,7 +64,7 @@
Map<String, AtomicComponent> contexts = MockContextFactory.createWiredMultiplicity("source", SourceImpl.class, Target.class, scope,
"target", OtherTarget.class, OtherTargetImpl.class, members, scope);
AtomicComponent sourceComponent = contexts.get("source");
- Source source = (Source) sourceComponent.getService();
+ Source source = (Source) sourceComponent.getServiceInstance();
List<Target> targets = source.getTargets();
assertEquals(1, targets.size());
Target target = targets.get(0);
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaComponentBuilderTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaComponentBuilderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaComponentBuilderTestCase.java Fri Jun 2 23:30:28 2006
@@ -47,7 +47,7 @@
JavaAtomicComponent<Source> ctx = (JavaAtomicComponent<Source>) builder.build(parent, sourceComponentDefinition, deploymentContext);
deploymentContext.getModuleScope().start();
ctx.start();
- Source source = ctx.getService();
+ Source source = ctx.getServiceInstance();
assertNotNull(source);
ctx.stop();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/JavaReferenceWireTestCase.java Fri Jun 2 23:30:28 2006
@@ -60,7 +60,7 @@
sourceContext.addOutboundWire(wire);
sourceContext.start();
- Source source = (Source) sourceContext.getService();
+ Source source = (Source) sourceContext.getServiceInstance();
assertSame(target, source.getTarget());
scope.stop();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/ReferenceInjectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/ReferenceInjectionTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/ReferenceInjectionTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/ReferenceInjectionTestCase.java Fri Jun 2 23:30:28 2006
@@ -29,7 +29,7 @@
Map<String, AtomicComponent> contexts = MockContextFactory.createWiredContexts("source", SourceImpl.class, scope,
members, "target", Target.class, TargetImpl.class, scope);
AtomicComponent sourceComponent = contexts.get("source");
- Source source = (Source) sourceComponent.getService();
+ Source source = (Source) sourceComponent.getServiceInstance();
Target target = source.getTarget();
assertTrue(Proxy.isProxyClass(target.getClass()));
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/integration/context/ScopeReferenceTestCase.java Fri Jun 2 23:30:28 2006
@@ -65,8 +65,8 @@
scope.onEvent(new CompositeStart(this, null));
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -95,8 +95,8 @@
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -110,7 +110,7 @@
ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
@@ -143,8 +143,8 @@
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- final Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ final Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -156,7 +156,7 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
source.getTarget().setString("bar");
@@ -191,14 +191,14 @@
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -225,8 +225,8 @@
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
source.getTarget().setString("foo");
source.getTarget().setString("foo");
assertEquals("foo", target.getString());
@@ -239,9 +239,9 @@
ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Source source2 = sourceComponent.getService();
+ Source source2 = sourceComponent.getServiceInstance();
assertNotNull(source2);
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertNotNull(target2);
assertNull(target2.getString());
@@ -274,8 +274,8 @@
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -289,8 +289,8 @@
ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = targetComponent.getService();
- Source source2 = sourceComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
+ Source source2 = sourceComponent.getServiceInstance();
assertEquals("foo", target2.getString());
assertEquals("foo", source2.getTarget().getString());
source2.getTarget().setString("baz");
@@ -322,8 +322,8 @@
requestScope.onEvent(new RequestStart(this));
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- final Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ final Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -335,7 +335,7 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
source.getTarget().setString("bar");
@@ -375,14 +375,14 @@
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -408,8 +408,8 @@
final AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -421,8 +421,8 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Source source2 = sourceComponent.getService();
- Target target2 = targetComponent.getService();
+ Source source2 = sourceComponent.getServiceInstance();
+ Target target2 = targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source2.getTarget().getString()));
source2.getTarget().setString("bar");
@@ -455,8 +455,8 @@
final AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -468,8 +468,8 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Source source2 = sourceComponent.getService();
- Target target2 = targetComponent.getService();
+ Source source2 = sourceComponent.getServiceInstance();
+ Target target2 = targetComponent.getServiceInstance();
assertEquals("foo", target2.getString());
assertEquals("foo", source2.getTarget().getString());
source2.getTarget().setString("bar");
@@ -508,8 +508,8 @@
final AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
requestScope.onEvent(new RequestStart(this));
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -521,8 +521,8 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Source source2 = sourceComponent.getService();
- Target target2 = targetComponent.getService();
+ Source source2 = sourceComponent.getServiceInstance();
+ Target target2 = targetComponent.getServiceInstance();
assertEquals("foo", target2.getString());
assertEquals("foo", source2.getTarget().getString());
source2.getTarget().setString("bar");
@@ -560,14 +560,14 @@
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
requestScope.onEvent(new RequestStart(this));
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -591,14 +591,14 @@
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertTrue(Proxy.isProxyClass(source.getTarget().getClass()));
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
assertFalse("foo".equals(source.getTarget().getString()));
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
source.getTarget().setString("bar");
assertFalse("bar".equals(source.getTarget().getString()));
@@ -621,8 +621,8 @@
requestScope.onEvent(new RequestStart(this));
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
final AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- final Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ final Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -634,7 +634,7 @@
FutureTask<Void> future = new FutureTask<Void>(new Runnable() {
public void run() {
requestScope.onEvent(new RequestStart(this));
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
source.getTarget().setString("bar");
@@ -667,8 +667,8 @@
sessionScope.onEvent(new HttpSessionStart(this, session1));
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -682,7 +682,7 @@
ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
sessionScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertFalse("foo".equals(target2.getString()));
assertFalse("foo".equals(source.getTarget().getString()));
@@ -713,8 +713,8 @@
moduleScope.onEvent(new CompositeStart(this, null));
AtomicComponent<Source> sourceComponent = (AtomicComponent<Source>) contexts.get("source");
AtomicComponent<Target> targetComponent = (AtomicComponent<Target>) contexts.get("target");
- Source source = sourceComponent.getService();
- Target target = targetComponent.getService();
+ Source source = sourceComponent.getServiceInstance();
+ Target target = targetComponent.getServiceInstance();
assertNull(source.getTarget().getString());
assertNull(target.getString());
target.setString("foo");
@@ -726,7 +726,7 @@
ctx.setIdentifier(HttpSessionScopeContext.HTTP_IDENTIFIER, session2);
moduleScope.onEvent(new HttpSessionStart(this, session2));
- Target target2 = targetComponent.getService();
+ Target target2 = targetComponent.getServiceInstance();
assertEquals("foo", target2.getString());
assertEquals("foo", source.getTarget().getString());
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/SpringCompositeComponent.java Fri Jun 2 23:30:28 2006
@@ -85,7 +85,7 @@
if (context == null) {
throw new NoSuchBeanDefinitionException("SCA service not found [" + name + "]");
}
- return context.getService();
+ return context.getServiceInstance();
}
public Object getBean(String name, Class requiredType) throws BeansException {
@@ -105,7 +105,7 @@
// need null check since Spring may pass in a null
throw new BeanNotOfRequiredTypeException(name, requiredType, type);
}
- return context.getService();
+ return context.getServiceInstance();
}
public boolean containsBean(String name) {
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ReferenceInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ReferenceInvocationTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ReferenceInvocationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ReferenceInvocationTestCase.java Fri Jun 2 23:30:28 2006
@@ -28,7 +28,7 @@
Mock mock = mock(Reference.class);
mock.stubs().method("getName").will(returnValue("bar"));
mock.stubs().method("getInterface").will(returnValue(TestBean.class));
- mock.expects(atLeastOnce()).method("getService").will(returnValue(referenceTarget));
+ mock.expects(atLeastOnce()).method("getServiceInstance").will(returnValue(referenceTarget));
Reference reference = (Reference) mock.proxy();
parent.register(reference);
ctx.getBean("foo");
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/ServiceInvocationTestCase.java Fri Jun 2 23:30:28 2006
@@ -38,7 +38,7 @@
chain.setTargetInvoker(context.createTargetInvoker("foo", chain.getMethod()));
}
context.register(service);
- assertEquals("bar", ((TestBean) context.getChild("fooService").getService()).echo("bar"));
+ assertEquals("bar", ((TestBean) context.getChild("fooService").getServiceInstance()).echo("bar"));
}
Modified: incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/containers/container.spring/src/test/java/org/apache/tuscany/container/spring/SpringCompositeBuilderTestCase.java Fri Jun 2 23:30:28 2006
@@ -53,7 +53,7 @@
builder.setBuilderRegistry((BuilderRegistry) mock.proxy());
CompositeComponent component = (CompositeComponent) builder.build(null, componentDefinition, null);
Service service = (Service) component.getChild("fooService");
- TestBean bean = (TestBean) service.getService();
+ TestBean bean = (TestBean) service.getServiceInstance();
assertEquals("foo", bean.echo("foo"));
}
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=411390&r1=411389&r2=411390&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 Fri Jun 2 23:30:28 2006
@@ -21,7 +21,7 @@
import org.apache.tuscany.core.builder.ConnectorImpl;
import org.apache.tuscany.core.component.WorkContextImpl;
import org.apache.tuscany.core.component.scope.ScopeRegistryImpl;
-import org.apache.tuscany.core.composite.loader.CompositeLoader;
+import org.apache.tuscany.core.composite.CompositeLoader;
import org.apache.tuscany.core.deployer.DeployerImpl;
import org.apache.tuscany.core.loader.AssemblyConstants;
import org.apache.tuscany.core.loader.ComponentLoader;
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=411390&r1=411389&r2=411390&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 Fri Jun 2 23:30:28 2006
@@ -148,7 +148,7 @@
try {
if (context instanceof AtomicComponent || context instanceof Reference
|| context instanceof SystemService) {
- return instanceInterface.cast(context.getService());
+ return instanceInterface.cast(context.getServiceInstance());
} else {
IllegalTargetException e = new IllegalTargetException("Autowire target must be a system service, atomic, or reference context");
e.setIdentifier(instanceInterface.getName());
@@ -176,7 +176,7 @@
SystemService context = autowireExternal.get(instanceInterface);
if (context != null) {
try {
- return instanceInterface.cast(context.getService());
+ return instanceInterface.cast(context.getServiceInstance());
} catch (CoreRuntimeException e) {
e.addContextName(getName());
throw e;
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=411390&r1=411389&r2=411390&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 Fri Jun 2 23:30:28 2006
@@ -44,7 +44,7 @@
if (context instanceof AtomicComponent) {
return ((AtomicComponent) context).getServiceInstance(qName.getPortName());
} else if (context instanceof Service || context instanceof Reference) {
- return context.getService();
+ return context.getServiceInstance();
} else {
throw new ServiceUnavailableException("Illegal target type [" + name + "]");
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java Fri Jun 2 23:30:28 2006
@@ -4,6 +4,8 @@
import org.apache.tuscany.spi.ObjectFactory;
/**
+ * Creates a new HTTP session scope context
+ *
* @version $$Rev$$ $$Date$$
*/
public class HttpSessionScopeObjectFactory implements ObjectFactory<HttpSessionScopeContext> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ModuleScopeObjectFactory.java Fri Jun 2 23:30:28 2006
@@ -4,6 +4,8 @@
import org.apache.tuscany.spi.ObjectFactory;
/**
+ * Creates a new module scope context
+ *
* @version $$Rev$$ $$Date$$
*/
public class ModuleScopeObjectFactory implements ObjectFactory<ModuleScopeContext> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/RequestScopeObjectFactory.java Fri Jun 2 23:30:28 2006
@@ -4,6 +4,8 @@
import org.apache.tuscany.spi.ObjectFactory;
/**
+ * Creates a new request scope context
+ *
* @version $$Rev$$ $$Date$$
*/
public class RequestScopeObjectFactory implements ObjectFactory<RequestScopeContext> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/ScopeRegistryImpl.java Fri Jun 2 23:30:28 2006
@@ -11,6 +11,8 @@
import org.apache.tuscany.spi.model.Scope;
/**
+ * The default implementation of a scope registry
+ *
* @version $$Rev$$ $$Date$$
*/
public class ScopeRegistryImpl implements ScopeRegistry {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java Fri Jun 2 23:30:28 2006
@@ -4,6 +4,8 @@
import org.apache.tuscany.spi.ObjectFactory;
/**
+ * Creates a new stateless scope context
+ *
* @version $$Rev$$ $$Date$$
*/
public class StatelessScopeObjectFactory implements ObjectFactory<StatelessScopeContext> {
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeBuilder.java (from r411384, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/builder/CompositeBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeBuilder.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeBuilder.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/builder/CompositeBuilder.java&r1=411384&r2=411390&rev=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/builder/CompositeBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeBuilder.java Fri Jun 2 23:30:28 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tuscany.core.composite.builder;
+package org.apache.tuscany.core.composite;
import org.apache.tuscany.core.component.CompositeComponentImpl;
import org.apache.tuscany.spi.builder.BuilderConfigException;
@@ -34,6 +34,8 @@
import org.apache.tuscany.spi.model.ServiceDefinition;
/**
+ * Instantiates a composite component from an assembly definition
+ *
* @version $Rev$ $Date$
*/
public class CompositeBuilder extends ComponentBuilderExtension<CompositeImplementation> {
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeBuilder.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Copied: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java (from r411384, incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/loader/CompositeLoader.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java&p1=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/loader/CompositeLoader.java&r1=411384&r2=411390&rev=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/loader/CompositeLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java Fri Jun 2 23:30:28 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tuscany.core.composite.loader;
+package org.apache.tuscany.core.composite;
import javax.xml.namespace.QName;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
@@ -36,6 +36,8 @@
import org.apache.tuscany.spi.model.ServiceDefinition;
/**
+ * Loads a composite component definition from an XML-based assembly file
+ *
* @version $Rev$ $Date$
*/
public class CompositeLoader extends LoaderExtension<CompositeComponentType> {
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/composite/CompositeLoader.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/AssemblyConstants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/AssemblyConstants.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/AssemblyConstants.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/AssemblyConstants.java Fri Jun 2 23:30:28 2006
@@ -19,6 +19,8 @@
import javax.xml.namespace.QName;
/**
+ * Defines standard constants encountered in an XML-based assembly files
+ *
* @version $Rev$ $Date$
*/
public final class AssemblyConstants {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Fri Jun 2 23:30:28 2006
@@ -43,6 +43,8 @@
import org.apache.tuscany.spi.model.ReferenceTarget;
/**
+ * Loads a component definition from an XML-based assembly file
+ *
* @version $Rev$ $Date$
*/
public class ComponentLoader extends LoaderExtension<ComponentDefinition<?>> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceJavaLoader.java Fri Jun 2 23:30:28 2006
@@ -27,6 +27,8 @@
import org.apache.tuscany.spi.model.JavaServiceContract;
/**
+ * Loads a Java interface definition from an XML-based assembly file
+ *
* @version $Rev$ $Date$
*/
public class InterfaceJavaLoader extends LoaderExtension<JavaServiceContract> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/InterfaceWSDLLoader.java Fri Jun 2 23:30:28 2006
@@ -31,6 +31,8 @@
import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
/**
+ * Loads a WSDL interface definition from an XML-based assembly file
+ *
* @version $Rev$ $Date$
*/
public class InterfaceWSDLLoader extends LoaderExtension {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java Fri Jun 2 23:30:28 2006
@@ -36,6 +36,8 @@
import org.apache.tuscany.spi.model.ModelObject;
/**
+ * The default implementation of a loader registry
+ *
* @version $Rev$ $Date$
*/
public class LoaderRegistryImpl implements LoaderRegistry {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/PropertyLoader.java Fri Jun 2 23:30:28 2006
@@ -28,6 +28,8 @@
import org.apache.tuscany.spi.model.Property;
/**
+ * Loads a property from an XML-based assembly file
+ *
* @version $Rev$ $Date$
*/
public class PropertyLoader extends LoaderExtension<Property> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java Fri Jun 2 23:30:28 2006
@@ -32,6 +32,8 @@
import org.apache.tuscany.spi.model.ServiceContract;
/**
+ * Loads a reference from an XML-based assembly file
+ *
* @version $Rev$ $Date$
*/
public class ReferenceLoader extends LoaderExtension<ReferenceDefinition> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Fri Jun 2 23:30:28 2006
@@ -33,6 +33,8 @@
import org.apache.tuscany.spi.model.ServiceDefinition;
/**
+ * Loads a service definition from an XML-based assembly file
+ *
* @version $Rev$ $Date$
*/
public class ServiceLoader extends LoaderExtension<ServiceDefinition> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/model/PojoComponentType.java Fri Jun 2 23:30:28 2006
@@ -15,6 +15,8 @@
import org.apache.tuscany.spi.model.ServiceDefinition;
/**
+ * A component type specialization for POJO implementations
+ *
* @version $$Rev$$ $$Date$$
*/
public class PojoComponentType<S extends ServiceDefinition, R extends ReferenceDefinition, P extends Property<?>> extends ComponentType<S, R, P> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/PolicyBuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/PolicyBuilderRegistryImpl.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/PolicyBuilderRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/PolicyBuilderRegistryImpl.java Fri Jun 2 23:30:28 2006
@@ -13,6 +13,8 @@
import org.apache.tuscany.spi.wire.OutboundWire;
/**
+ * The default policy builder
+ *
* @version $Rev$ $Date$
*/
public class PolicyBuilderRegistryImpl implements PolicyBuilderRegistry {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncMonitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncMonitor.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncMonitor.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncMonitor.java Fri Jun 2 23:30:28 2006
@@ -1,6 +1,8 @@
package org.apache.tuscany.core.policy.async;
/**
+ * A monitor used by {@link AsyncInterceptor]
+ *
* @version $$Rev$$ $$Date$$
*/
public interface AsyncMonitor {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java Fri Jun 2 23:30:28 2006
@@ -15,6 +15,8 @@
import org.osoa.sca.annotations.OneWay;
/**
+ * A policy builder for handling the {@link OneWay} annotation
+ *
* @version $Rev: 368822 $ $Date: 2006-01-13 10:54:38 -0800 (Fri, 13 Jan 2006) $
*/
@org.osoa.sca.annotations.Scope("MODULE")
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/services/wsdl/WSDLDefinitionRegistryImpl.java Fri Jun 2 23:30:28 2006
@@ -36,6 +36,8 @@
import org.apache.tuscany.spi.services.wsdl.WSDLDefinitionRegistry;
/**
+ * The default implementation of the runtime WSDL registry
+ *
* @version $Rev$ $Date$
*/
public class WSDLDefinitionRegistryImpl implements WSDLDefinitionRegistry {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemBindingBuilder.java Fri Jun 2 23:30:28 2006
@@ -4,6 +4,7 @@
import org.apache.tuscany.core.system.component.SystemReferenceImpl;
import org.apache.tuscany.core.system.component.SystemService;
import org.apache.tuscany.core.system.component.SystemServiceImpl;
+import org.apache.tuscany.core.system.component.SystemReference;
import org.apache.tuscany.core.system.model.SystemBinding;
import org.apache.tuscany.core.system.wire.SystemInboundWire;
import org.apache.tuscany.core.system.wire.SystemInboundWireImpl;
@@ -21,31 +22,33 @@
import org.apache.tuscany.spi.wire.OutboundWire;
/**
+ * Creates {@link SystemService}s and {@link SystemReference}s by evaluating an assembly definition
+ *
* @version $$Rev$$ $$Date$$
*/
public class SystemBindingBuilder implements BindingBuilder<SystemBinding> {
- public SCAObject build(CompositeComponent parent, BoundServiceDefinition<SystemBinding> boundServiceDefinition, DeploymentContext deploymentContext) {
+ public SystemService build(CompositeComponent parent, BoundServiceDefinition<SystemBinding> boundServiceDefinition, DeploymentContext deploymentContext) {
Class<?> interfaze = boundServiceDefinition.getServiceContract().getInterfaceClass();
QualifiedName targetName = new QualifiedName(boundServiceDefinition.getTarget().getPath());
Component target = (Component) parent.getChild(targetName.getPartName());
SystemInboundWire<?> inboundWire = new SystemInboundWireImpl(boundServiceDefinition.getName(), interfaze, target);
SystemOutboundWire<?> outboundWire = new SystemOutboundWireImpl(boundServiceDefinition.getName(), targetName, interfaze);
- SystemService context = new SystemServiceImpl(boundServiceDefinition.getName(), parent);
- context.setInboundWire(inboundWire);
- context.setOutboundWire(outboundWire);
- return context;
+ SystemService service = new SystemServiceImpl(boundServiceDefinition.getName(), parent);
+ service.setInboundWire(inboundWire);
+ service.setOutboundWire(outboundWire);
+ return service;
}
- public SCAObject build(CompositeComponent parent, BoundReferenceDefinition<SystemBinding> boundReferenceDefinition, DeploymentContext deploymentContext) {
+ public SystemReference build(CompositeComponent parent, BoundReferenceDefinition<SystemBinding> boundReferenceDefinition, DeploymentContext deploymentContext) {
assert(parent.getParent() instanceof AutowireComponent):"Grandparent not an instance of " + AutowireComponent.class.getName();
- AutowireComponent autowireContext = (AutowireComponent) parent.getParent();
+ AutowireComponent autowireComponent = (AutowireComponent) parent.getParent();
Class<?> interfaze = boundReferenceDefinition.getServiceContract().getInterfaceClass();
- SystemReferenceImpl ctx = new SystemReferenceImpl(boundReferenceDefinition.getName(), interfaze, parent);
+ SystemReferenceImpl reference = new SystemReferenceImpl(boundReferenceDefinition.getName(), interfaze, parent);
SystemInboundWire<?> inboundWire = new SystemInboundWireImpl(boundReferenceDefinition.getName(), interfaze);
- OutboundWire<?> outboundWire = new SystemOutboundAutowire(boundReferenceDefinition.getName(), interfaze, autowireContext);
- ctx.setInboundWire(inboundWire);
- ctx.setOutboundWire(outboundWire);
- return ctx;
+ OutboundWire<?> outboundWire = new SystemOutboundAutowire(boundReferenceDefinition.getName(), interfaze, autowireComponent);
+ reference.setInboundWire(inboundWire);
+ reference.setOutboundWire(outboundWire);
+ return reference;
}
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentBuilder.java Fri Jun 2 23:30:28 2006
@@ -26,6 +26,7 @@
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContext;
+import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.ReferenceTarget;
@@ -33,11 +34,13 @@
import org.apache.tuscany.spi.wire.OutboundWire;
/**
+ * Produces system atomic components by evaluating an assembly
+ *
* @version $$Rev$$ $$Date$$
*/
public class SystemComponentBuilder implements ComponentBuilder<SystemImplementation> {
- public Component<?> build(CompositeComponent<?> parent, ComponentDefinition<SystemImplementation> componentDefinition, DeploymentContext deploymentContext) throws BuilderConfigException {
+ public AtomicComponent<?> build(CompositeComponent<?> parent, ComponentDefinition<SystemImplementation> componentDefinition, DeploymentContext deploymentContext) throws BuilderConfigException {
assert(parent instanceof AutowireComponent): "Parent must implement " + AutowireComponent.class.getName();
AutowireComponent autowireContext = (AutowireComponent) parent;
PojoComponentType<?, ?, ?> componentType = componentDefinition.getImplementation().getComponentType();
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/builder/SystemCompositeBuilder.java Fri Jun 2 23:30:28 2006
@@ -35,6 +35,8 @@
import org.apache.tuscany.spi.model.ServiceDefinition;
/**
+ * Produces system compisite components by evaluating an assembly
+ *
* @version $Rev$ $Date$
*/
public class SystemCompositeBuilder extends ComponentBuilderExtension<SystemCompositeImplementation> {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/ObjectRegistrationException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/ObjectRegistrationException.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/ObjectRegistrationException.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/ObjectRegistrationException.java Fri Jun 2 23:30:28 2006
@@ -3,6 +3,8 @@
import org.apache.tuscany.spi.component.ComponentRuntimeException;
/**
+ * Thrown when an error is encountered registering an object
+ *
* @version $$Rev$$ $$Date$$
*/
public class ObjectRegistrationException extends ComponentRuntimeException {
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponent.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponent.java Fri Jun 2 23:30:28 2006
@@ -4,7 +4,7 @@
import org.apache.tuscany.spi.component.TargetException;
/**
- * Implementations manage system atomic components
+ * Implementations are specialized atomic components used to provide system services by the runtime
*
* @version $$Rev$$ $$Date$$
*/
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemAtomicComponentImpl.java Fri Jun 2 23:30:28 2006
@@ -69,7 +69,7 @@
return getTargetInstance();
}
- public T getService() throws TargetException {
+ public T getServiceInstance() throws TargetException {
return getTargetInstance();
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponent.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponent.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemCompositeComponent.java Fri Jun 2 23:30:28 2006
@@ -3,7 +3,8 @@
import org.apache.tuscany.core.component.AutowireComponent;
/**
- * Marker type for system composite contexts
+ * Marker type for a specialized composite component. System composites are used by the runtime to manage
+ * system components that offer services used by the runtime
*
* @version $Rev: 392199 $ $Date: 2006-04-06 23:32:29 -0700 (Thu, 06 Apr 2006) $
*/
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReferenceImpl.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReferenceImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemReferenceImpl.java Fri Jun 2 23:30:28 2006
@@ -70,7 +70,7 @@
}
}
- public T getService() throws TargetException {
+ public T getServiceInstance() throws TargetException {
return referenceInterface.cast(inboundWire.getTargetService());
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemServiceImpl.java?rev=411390&r1=411389&r2=411390&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemServiceImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/component/SystemServiceImpl.java Fri Jun 2 23:30:28 2006
@@ -56,7 +56,7 @@
throw new UnsupportedOperationException();
}
- public T getService() throws TargetException {
+ public T getServiceInstance() throws TargetException {
return inboundWire.getTargetService();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org