tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r703068 [1/7] - in /tuscany/branches/sca-equinox: itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/ itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ itest/databindings/jaxb-top...
Date Thu, 09 Oct 2008 06:34:01 GMT
Author: jsdelfino
Date: Wed Oct  8 23:33:54 2008
New Revision: 703068

URL: http://svn.apache.org/viewvc?rev=703068&view=rev
Log:
Work in progress. Fixed implementation of NodeImpl, now working without dependencies on implementations from other bundles (except RuntimeAssemblyFactory, which will need to be cleaned up too). Started to remove dependencies on host-embedded and port code to NodeFactory and Node, as an interim step to bring them up, before porting them to the OSGi-enabled node launcher.

Added:
    tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Client.java
      - copied, changed from r703066, tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
    tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java
      - copied, changed from r703066, tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
    tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
      - copied, changed from r703066, tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
    tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
      - copied, changed from r703066, tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
    tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
      - copied, changed from r703066, tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
Removed:
    tuscany/branches/sca-equinox/modules/host-embedded/LICENSE
    tuscany/branches/sca-equinox/modules/host-embedded/META-INF/README
    tuscany/branches/sca-equinox/modules/host-embedded/NOTICE
    tuscany/branches/sca-equinox/modules/host-embedded/pom.xml
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/resources/test.composite
    tuscany/branches/sca-equinox/modules/host-embedded/src/test/resources/test.txt
    tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
    tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
    tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
    tuscany/branches/sca-equinox/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
Modified:
    tuscany/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
    tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
    tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
    tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
    tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
    tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
    tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
    tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
    tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
    tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
    tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
    tuscany/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
    tuscany/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
    tuscany/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
    tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTest.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTest.java
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTest.java
    tuscany/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumer.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/Consumer.java
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/Provider.java
    tuscany/branches/sca-equinox/modules/binding-http-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
    tuscany/branches/sca-equinox/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
    tuscany/branches/sca-equinox/modules/binding-jms-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
    tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
    tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
    tuscany/branches/sca-equinox/modules/binding-rmi-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
    tuscany/branches/sca-equinox/modules/binding-rss-rome/pom.xml
    tuscany/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
    tuscany/branches/sca-equinox/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
    tuscany/branches/sca-equinox/modules/binding-rss/pom.xml
    tuscany/branches/sca-equinox/modules/binding-sca-axis2/pom.xml
    tuscany/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
    tuscany/branches/sca-equinox/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
    tuscany/branches/sca-equinox/modules/host-webapp/pom.xml
    tuscany/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml
    tuscany/branches/sca-equinox/modules/implementation-ejb/pom.xml
    tuscany/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
    tuscany/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
    tuscany/branches/sca-equinox/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
    tuscany/branches/sca-equinox/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
    tuscany/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
    tuscany/branches/sca-equinox/modules/implementation-script-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
    tuscany/branches/sca-equinox/modules/implementation-spring/pom.xml
    tuscany/branches/sca-equinox/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java
    tuscany/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/implementation-widget-runtime/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
    tuscany/branches/sca-equinox/modules/implementation-xquery/pom.xml
    tuscany/branches/sca-equinox/modules/node-impl/pom.xml
    tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
    tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
    tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
    tuscany/branches/sca-equinox/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
    tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
    tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
    tuscany/branches/sca-equinox/modules/node-manager/pom.xml
    tuscany/branches/sca-equinox/modules/pom.xml
    tuscany/branches/sca-equinox/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
    tuscany/branches/sca-equinox/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
    tuscany/branches/sca-equinox/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
    tuscany/branches/sca-equinox/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
    tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
    tuscany/branches/sca-equinox/samples/calculator/src/main/java/calculator/CalculatorClient.java
    tuscany/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
    tuscany/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
    tuscany/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
    tuscany/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
    tuscany/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
    tuscany/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
    tuscany/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
    tuscany/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
    tuscany/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
    tuscany/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
    tuscany/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
    tuscany/branches/sca-equinox/tutorials/store/store-client/launch/LaunchStoreClientNode.java
    tuscany/branches/sca-equinox/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
    tuscany/branches/sca-equinox/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java

Modified: tuscany/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java Wed Oct  8 23:33:54 2008
@@ -25,10 +25,10 @@
 
 import junit.framework.Assert;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -40,8 +40,8 @@
  */
 public class CallableReferenceRemoteTestCase {
     
-    private static SCANode nodeA;
-    private static SCANode nodeB;
+    private static Node nodeA;
+    private static Node nodeB;
    
     private static AComponent acomponent;
 
@@ -52,21 +52,21 @@
             
             System.out.println("Setting up nodes");
                   
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),
-                                             new SCAContribution("TestContribution", 
+            NodeFactory nodeFactory = NodeFactory.newInstance();
+            nodeA = nodeFactory.createNode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),
+                                             new Contribution("TestContribution", 
                                                                  new File("src/main/resources/nodeA").toURL().toString()));
             
      
-            nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),
-                                             new SCAContribution("TestContribution", 
+            nodeB = nodeFactory.createNode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),
+                                             new Contribution("TestContribution", 
                                                                  new File("src/main/resources/nodeB").toURL().toString()));
             
             
             nodeA.start();
             nodeB.start();
             
-            acomponent = ((SCAClient)nodeA).getService(AComponent.class, "AComponent/AComponent");
+            acomponent = ((Client)nodeA).getService(AComponent.class, "AComponent/AComponent");
                
         } catch (Throwable ex) {
             System.out.println(ex.toString());

Modified: tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java Wed Oct  8 23:33:54 2008
@@ -24,10 +24,10 @@
 
 
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -35,20 +35,20 @@
 
 public class ConversationWSDLTestCase {
 
-    private SCANode node; 
+    private Node node; 
     private ConversationalClient conversationalStatelessClientStatefulService;    
 
     @Before
     public void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),
-                                         new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),
+                                         new Contribution("TestContribution", 
                                                                      new File("src/main/resources/ConversationalWSDL").toURL().toString()));
                 
          
         node.start();
         
-        conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");
+        conversationalStatelessClientStatefulService = ((Client)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");
         
         
         ConversationalClientStatelessImpl.calls  = new StringBuffer(); 

Modified: tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java Wed Oct  8 23:33:54 2008
@@ -29,17 +29,17 @@
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class NonConversationalCallbackTestCase {
 
-    private static SCANode node;
+    private static Node node;
     private static ConversationalClient conversationalStatelessClientStatelessService;
     private static ConversationalClient conversationalStatelessClientStatefulService;
     private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -50,28 +50,28 @@
     @BeforeClass
     public static void setUp() throws Exception {
     	try {
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
-                                             new SCAContribution("TestContribution", 
+            NodeFactory nodeFactory = NodeFactory.newInstance();
+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+                                             new Contribution("TestContribution", 
                                                                  new File("src/main/resources/Conversational").toURL().toString()));
                     
              
             node.start();
             
-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 
 	                                                                          "ConversationalStatelessClientStatelessService");
 	
-	    conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 
+	    conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 
 	                                                                          "ConversationalStatelessClientStatefulService");
 	
-	    conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 
+	    conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 
 	                                                                          "ConversationalStatefulClientStatelessService");
 	
-	    conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 
+	    conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 
 	                                                                          "ConversationalStatefulClientStatefulService");
-	    conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 
+	    conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 
 	                                                                          "ConversationalStatelessClientRequestService");
-	    conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 
+	    conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 
 	                                                                          "ConversationalStatefulClientNonConversationalCallbackStatefulService");
 	        
 	    // reset the place where we record the sequence of calls passing

Modified: tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java Wed Oct  8 23:33:54 2008
@@ -30,17 +30,17 @@
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class RequestScopeTestCase {
 
-    private static SCANode node;
+    private static Node node;
     private static ConversationalClient conversationalStatelessClientStatelessService;
     private static ConversationalClient conversationalStatelessClientStatefulService;
     private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -51,28 +51,28 @@
     @BeforeClass
     public static void setUp() throws Exception {
         try {
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
-                                             new SCAContribution("TestContribution", 
+            NodeFactory nodeFactory = NodeFactory.newInstance();
+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+                                             new Contribution("TestContribution", 
                                                                  new File("src/main/resources/Conversational").toURL().toString()));
                     
              
             node.start();
             
-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientStatelessService");
         
-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientStatefulService");
         
-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientStatelessService");
         
-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientStatefulService");
-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientRequestService");
-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");
                 
             // reset the place where we record the sequence of calls passing

Modified: tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java Wed Oct  8 23:33:54 2008
@@ -29,17 +29,17 @@
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class StatefulStatefulTestCase {
 
-    private static SCANode node;
+    private static Node node;
     private static ConversationalClient conversationalStatelessClientStatelessService;
     private static ConversationalClient conversationalStatelessClientStatefulService;
     private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -50,28 +50,28 @@
     @BeforeClass
     public static void setUp() throws Exception {
         try {
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
-                                             new SCAContribution("TestContribution", 
+            NodeFactory nodeFactory = NodeFactory.newInstance();
+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+                                             new Contribution("TestContribution", 
                                                                  new File("src/main/resources/Conversational").toURL().toString()));
                     
              
             node.start();
             
-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientStatelessService");
         
-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientStatefulService");
         
-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientStatelessService");
         
-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientStatefulService");
-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientRequestService");
-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");
                 
             // reset the place where we record the sequence of calls passing

Modified: tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java Wed Oct  8 23:33:54 2008
@@ -29,17 +29,17 @@
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class StatefulStatelessTestCase {
 
-    private static SCANode node;
+    private static Node node;
     private static ConversationalClient conversationalStatelessClientStatelessService;
     private static ConversationalClient conversationalStatelessClientStatefulService;
     private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -50,28 +50,28 @@
     @BeforeClass
     public static void setUp() throws Exception {
         try {
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
-                                             new SCAContribution("TestContribution", 
+            NodeFactory nodeFactory = NodeFactory.newInstance();
+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+                                             new Contribution("TestContribution", 
                                                                  new File("src/main/resources/Conversational").toURL().toString()));
                     
              
             node.start();
             
-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientStatelessService");
         
-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientStatefulService");
         
-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientStatelessService");
         
-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientStatefulService");
-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientRequestService");
-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");
                 
             // reset the place where we record the sequence of calls passing

Modified: tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java Wed Oct  8 23:33:54 2008
@@ -28,17 +28,17 @@
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class StatelessStatefulTestCase {
 
-    private static SCANode node;
+    private static Node node;
     private static ConversationalClient conversationalStatelessClientStatelessService;
     private static ConversationalClient conversationalStatelessClientStatefulService;
     private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -49,28 +49,28 @@
     @BeforeClass
     public static void setUp() throws Exception {
         try {
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
-                                             new SCAContribution("TestContribution", 
+            NodeFactory nodeFactory = NodeFactory.newInstance();
+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+                                             new Contribution("TestContribution", 
                                                                  new File("src/main/resources/Conversational").toURL().toString()));
                     
              
             node.start();
             
-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientStatelessService");
         
-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientStatefulService");
         
-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientStatelessService");
         
-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientStatefulService");
-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientRequestService");
-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");
                 
             // reset the place where we record the sequence of calls passing

Modified: tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java Wed Oct  8 23:33:54 2008
@@ -28,17 +28,17 @@
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class StatelessStatelessTestCase {
 
-    private static SCANode node;
+    private static Node node;
     private static ConversationalClient conversationalStatelessClientStatelessService;
     private static ConversationalClient conversationalStatelessClientStatefulService;
     private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -49,28 +49,28 @@
     @BeforeClass
     public static void setUp() throws Exception {
         try {
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
-                                             new SCAContribution("TestContribution", 
+            NodeFactory nodeFactory = NodeFactory.newInstance();
+            node = nodeFactory.createNode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+                                             new Contribution("TestContribution", 
                                                                  new File("src/main/resources/Conversational").toURL().toString()));
                     
              
             node.start();
             
-            conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatelessService = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientStatelessService");
         
-            conversationalStatelessClientStatefulService  = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientStatefulService  = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientStatefulService");
         
-            conversationalStatefulClientStatelessService  = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientStatelessService  = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientStatelessService");
         
-            conversationalStatefulClientStatefulService   = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientStatefulService   = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientStatefulService");
-            conversationalStatelessClientRequestService    = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatelessClientRequestService    = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatelessClientRequestService");
-            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((SCAClient)node).getService(ConversationalClient.class, 
+            conversationalStatefulClientNonConversationalCallbackStatelessService    = ((Client)node).getService(ConversationalClient.class, 
                                                                                   "ConversationalStatefulClientNonConversationalCallbackStatefulService");
                 
             // reset the place where we record the sequence of calls passing

Modified: tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java Wed Oct  8 23:33:54 2008
@@ -27,9 +27,9 @@
 import junit.framework.Assert;
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -39,8 +39,8 @@
  */
 public class DatabindingTestCase {
 
-    private static SCAClient client;
-    private static SCANode node;
+    private static Client client;
+    private static Node node;
 
     /**
      * Runs once before running the tests
@@ -48,10 +48,10 @@
     @BeforeClass
     public static void setUp() throws Exception {
         try {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        NodeFactory nodeFactory = NodeFactory.newInstance();
         node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/helloservice.composite", null);
         node.start();
-        client = (SCAClient)node;
+        client = (Client)node;
         }catch(Throwable e) {
             e.printStackTrace();
         }

Modified: tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java Wed Oct  8 23:33:54 2008
@@ -22,9 +22,9 @@
 import junit.framework.Assert;
 
 import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -34,18 +34,18 @@
  */
 public class PrimitivesDatabindingTestCase {
 
-    private static SCAClient domain;
-    private static SCANode node;
+    private static Client domain;
+    private static Node node;
 
     /**
      * Runs before each test method
      */
     @BeforeClass
     public static void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        NodeFactory nodeFactory = NodeFactory.newInstance();
         node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/primitivesservice.composite", null);
         node.start();
-        domain = (SCAClient)node;
+        domain = (Client)node;
     }
 
     /**

Modified: tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java Wed Oct  8 23:33:54 2008
@@ -55,9 +55,9 @@
 import org.apache.tuscany.sca.databinding.xml.String2Node;
 import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient;
 import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -69,18 +69,18 @@
  */
 public class StandardTypesDatabindingTestCase {
 
-    private static SCAClient domain;
-    private static SCANode node;
+    private static Client domain;
+    private static Node node;
 
     /**
      * Runs once before the tests
      */
     @BeforeClass
     public static void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        NodeFactory nodeFactory = NodeFactory.newInstance();
         node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/standard-types-service.composite", null);
         node.start();
-        domain = (SCAClient)node;
+        domain = (Client)node;
     }
 
     /**

Modified: tuscany/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java Wed Oct  8 23:33:54 2008
@@ -23,10 +23,10 @@
 
 import junit.framework.Assert;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -38,9 +38,9 @@
  */
 public class LateReferenceResolutionTestCase {
 
-    private static SCANode nodeA;
-    private static SCANode nodeB;
-    private static SCANode nodeC;
+    private static Node nodeA;
+    private static Node nodeB;
+    private static Node nodeC;
 
     private static CalculatorService calculatorService;
     
@@ -53,22 +53,22 @@
             System.out.println("Setting up domain");
 
             
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            nodeC = nodeFactory.createSCANode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeC", 
+            NodeFactory nodeFactory = NodeFactory.newInstance();
+            nodeC = nodeFactory.createNode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(),
+                new Contribution("NodeC", 
                                     new File("src/main/resources/nodeC").toURL().toString()));
-            nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeB", 
+            nodeB = nodeFactory.createNode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(),
+                new Contribution("NodeB", 
                                     new File("src/main/resources/nodeB").toURL().toString()));
-            nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(),
-                new SCAContribution("NodeA", 
+            nodeA = nodeFactory.createNode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(),
+                new Contribution("NodeA", 
                                     new File("src/main/resources/nodeA").toURL().toString()));
 
             nodeC.start();
             nodeB.start();
             nodeA.start();
             
-            SCAClient client = (SCAClient)nodeA;
+            Client client = (Client)nodeA;
             calculatorService = 
                 client.getService(CalculatorService.class, "CalculatorServiceComponentA");
 

Modified: tuscany/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java Wed Oct  8 23:33:54 2008
@@ -30,9 +30,9 @@
 import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;
 import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl;
 import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -49,7 +49,7 @@
      */
     private static final int MAX_SLEEP_TIME = 10000;
 
-    private SCANode node;
+    private Node node;
     
     /**
      * Initialise the SCADomain.
@@ -59,7 +59,7 @@
     @Before
     public void setUp() throws Exception {
         
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+        NodeFactory nodeFactory = NodeFactory.newInstance();
         node = nodeFactory.createSCANodeFromClassLoader("OneWayContribution/META-INF/sca-deployables/oneWay.composite", null);
         node.start();
         
@@ -84,7 +84,7 @@
     @Test
     public void testOneWay() throws Exception {
         OneWayClient client =
-            ((SCAClient)node).getService(OneWayClient.class, "OneWayClientComponent");
+            ((Client)node).getService(OneWayClient.class, "OneWayClientComponent");
 
         int count = 100;
 
@@ -120,7 +120,7 @@
     @Test
     public void testOneWayUsingNonBlockingInterceptorThrowsAnException() {
         OneWayClient client =
-            ((SCAClient)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");
+            ((Client)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding");
             
         // We need to modify the JDK Logger for the NonBlockingInterceptor so we
         // can check that it logs a message for the @OneWay invocation that throws

Modified: tuscany/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java Wed Oct  8 23:33:54 2008
@@ -24,9 +24,9 @@
 import junit.framework.Assert;
 import helloworld.HelloWorldService;
 
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.ws.security.util.Base64;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -39,18 +39,18 @@
 import com.meterware.httpunit.WebResponse;
 
 public class BasicAuthTestCase {
-    private static SCANode node;
+    private static Node node;
     private static HelloWorldService service;
 
     @BeforeClass
     public static void init() throws Exception {
         try {
-            SCANodeFactory factory = SCANodeFactory.newInstance();
+            NodeFactory factory = NodeFactory.newInstance();
             node = factory.createSCANodeFromClassLoader("helloworld.composite", 
                                                         BasicAuthTestCase.class.getClassLoader());
             node.start();
             
-            service = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
+            service = ((Client)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
         } catch (Exception ex) {
             ex.printStackTrace();
         }

Modified: tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java Wed Oct  8 23:33:54 2008
@@ -27,10 +27,10 @@
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,13 +39,13 @@
 public class ComponentReferenceTargetNotFoundTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/ComponentReferenceTargetNotFound").toURL().toString()));
         
         try {
@@ -54,7 +54,7 @@
             // do nothing - the SCA binding throws and exception here 
             // because the interface for the reference is not remotable
         }
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override

Modified: tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java Wed Oct  8 23:33:54 2008
@@ -27,22 +27,22 @@
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
  * This shows how to test the Calculator service component.
  */
 public class DuplicateImplementationPropertyNameTestCase extends TestCase {
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateImplementationPropertyName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/DuplicateImplementationPropertyName/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/DuplicateImplementationPropertyName").toURL().toString()));
     }
 

Modified: tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java Wed Oct  8 23:33:54 2008
@@ -27,9 +27,9 @@
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -37,13 +37,13 @@
  */
 public class DuplicateImplementationReferenceNameTestCase extends TestCase {
 
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateImplementationReferenceName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/DuplicateImplementationReferenceName/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/DuplicateImplementationReferenceName").toURL().toString()));
     }
 

Modified: tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java Wed Oct  8 23:33:54 2008
@@ -27,10 +27,10 @@
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@
 public class DuplicatePropertyNameTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicatePropertyName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/DuplicatePropertyName/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/DuplicatePropertyName").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override

Modified: tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java Wed Oct  8 23:33:54 2008
@@ -27,10 +27,10 @@
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@
 public class DuplicateReferenceNameTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateReferenceName/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/DuplicateReferenceName/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/DuplicateReferenceName").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override

Modified: tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java (original)
+++ tuscany/branches/sca-equinox/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java Wed Oct  8 23:33:54 2008
@@ -27,10 +27,10 @@
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
@@ -39,16 +39,16 @@
 public class MultipleBindingsForServiceTestCase extends TestCase {
 
     private CalculatorService calculatorService;
-    private SCANode node;
+    private Node node;
 
     @Override
     protected void setUp() throws Exception {
-        SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-        node = nodeFactory.createSCANode(new File("src/main/resources/MultipleBindingsForService/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
+        NodeFactory nodeFactory = NodeFactory.newInstance();
+        node = nodeFactory.createNode(new File("src/main/resources/MultipleBindingsForService/Calculator.composite").toURL().toString(),
+        		                 new Contribution("TestContribution", 
         		                                     new File("src/main/resources/MultipleBindingsForService").toURL().toString()));
         node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
     }
 
     @Override



Mime
View raw message