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/03/15 14:02:51 UTC
svn commit: r386066 - in /incubator/tuscany/java/sca:
container.java/src/main/java/org/apache/tuscany/container/java/builder/
container.java/src/test/java/org/apache/tuscany/container/java/builder/
container.java/src/test/java/org/apache/tuscany/contai...
Author: jmarino
Date: Wed Mar 15 05:02:49 2006
New Revision: 386066
URL: http://svn.apache.org/viewcvs?rev=386066&view=rev
Log:
minor variable renames corresponding to ContextFractory class rename
Modified:
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBinding.java
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java?rev=386066&r1=386065&r2=386066&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java Wed Mar 15 05:02:49 2006
@@ -161,7 +161,7 @@
Class implClass = null;
Set<Field> fields;
Set<Method> methods;
- JavaContextFactory config = null;
+ JavaContextFactory contextFactory = null;
try {
implClass = javaImpl.getImplementationClass();
fields = JavaIntrospectionHelper.getAllFields(implClass);
@@ -169,7 +169,7 @@
String name = component.getName();
Constructor ctr = implClass.getConstructor((Class[]) null);
- config = new JavaContextFactory(name, JavaIntrospectionHelper
+ contextFactory = new JavaContextFactory(name, JavaIntrospectionHelper
.getDefaultConstructor(implClass), scope);
List<Injector> injectors = new ArrayList();
@@ -177,7 +177,7 @@
EventInvoker initInvoker = null;
boolean eagerInit = false;
EventInvoker destroyInvoker = null;
- ContextObjectFactory contextFactory = new ContextObjectFactory(config);
+ ContextObjectFactory contextObjectFactory = new ContextObjectFactory(contextFactory);
for (Field field : fields) {
ComponentName compName = field.getAnnotation(ComponentName.class);
if (compName != null) {
@@ -186,7 +186,7 @@
}
Context context = field.getAnnotation(Context.class);
if (context != null) {
- Injector injector = new FieldInjector(field, contextFactory);
+ Injector injector = new FieldInjector(field, contextObjectFactory);
injectors.add(injector);
}
}
@@ -210,7 +210,7 @@
}
Context context = method.getAnnotation(Context.class);
if (context != null) {
- Injector injector = new MethodInjector(method, contextFactory);
+ Injector injector = new MethodInjector(method, contextObjectFactory);
injectors.add(injector);
}
}
@@ -222,7 +222,7 @@
injectors.add(injector);
}
}
- component.getComponentImplementation().setContextFactory(config);
+ component.getComponentImplementation().setContextFactory(contextFactory);
// create target-side invocation chains for each service offered by the implementation
for (ConfiguredService configuredService : component.getConfiguredServices()) {
@@ -241,7 +241,7 @@
.getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
- config.addTargetProxyFactory(service.getName(), proxyFactory);
+ contextFactory.addTargetProxyFactory(service.getName(), proxyFactory);
configuredService.setProxyFactory(proxyFactory);
if (policyBuilder != null) {
// invoke the reference builder to handle target-side metadata
@@ -258,15 +258,15 @@
Map<String, ConfiguredReference> configuredReferences = component.getConfiguredReferences();
if (configuredReferences != null) {
for (ConfiguredReference reference : configuredReferences.values()) {
- Injector injector = createReferenceInjector(config, reference, fields, methods);
+ Injector injector = createReferenceInjector(contextFactory, reference, fields, methods);
injectors.add(injector);
}
}
- config.setSetters(injectors);
- config.setEagerInit(eagerInit);
- config.setInitInvoker(initInvoker);
- config.setDestroyInvoker(destroyInvoker);
+ contextFactory.setSetters(injectors);
+ contextFactory.setEagerInit(eagerInit);
+ contextFactory.setInitInvoker(initInvoker);
+ contextFactory.setDestroyInvoker(destroyInvoker);
} catch (BuilderException e) {
e.addContextName(component.getName());
throw e;
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java?rev=386066&r1=386065&r2=386066&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilderTestCase.java Wed Mar 15 05:02:49 2006
@@ -69,8 +69,8 @@
for (Component component : components) {
compMap.put(component.getName(), component);
builder.build(component);
- ContextFactory config = (ContextFactory) component.getComponentImplementation().getContextFactory();
- Assert.assertNotNull(config);
+ ContextFactory contextFactory = (ContextFactory) component.getComponentImplementation().getContextFactory();
+ Assert.assertNotNull(contextFactory);
}
for (Component component : components) {
ContextFactory source = (ContextFactory) component.getComponentImplementation().getContextFactory();
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBinding.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBinding.java?rev=386066&r1=386065&r2=386066&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBinding.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBinding.java Wed Mar 15 05:02:49 2006
@@ -45,15 +45,15 @@
return false;
}
- private Object config;
+ private Object contextFactory;
- public void setContextFactory(Object configuration) {
- config = configuration;
+ public void setContextFactory(Object factory) {
+ contextFactory = factory;
}
public Object getContextFactory() {
System.out.println("retting");
- return config;
+ return contextFactory;
}
}
Modified: incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java?rev=386066&r1=386065&r2=386066&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/mock/binding/foo/FooBindingBuilder.java Wed Mar 15 05:02:49 2006
@@ -20,8 +20,8 @@
import java.util.Set;
import org.apache.tuscany.core.builder.BuilderException;
-import org.apache.tuscany.core.builder.ObjectFactory;
import org.apache.tuscany.core.builder.ContextFactoryBuilder;
+import org.apache.tuscany.core.builder.ObjectFactory;
import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
import org.apache.tuscany.core.builder.impl.HierarchicalBuilder;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
@@ -112,7 +112,7 @@
if (ep.getBindings().size() < 1 || !(ep.getBindings().get(0) instanceof FooBinding)) {
return;
}
- EntryPointContextFactory config = new FooEntryPointContextFactory(ep.getName(), ep.getConfiguredService()
+ EntryPointContextFactory contextFactory = new FooEntryPointContextFactory(ep.getName(), ep.getConfiguredService()
.getService().getName(), messageFactory);
ConfiguredService configuredService = ep.getConfiguredService();
@@ -129,7 +129,7 @@
ProxyConfiguration pConfiguration = new ProxyConfiguration(qName, iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
- config.addSourceProxyFactory(service.getName(), proxyFactory);
+ contextFactory.addSourceProxyFactory(service.getName(), proxyFactory);
configuredService.setProxyFactory(proxyFactory);
if (policyBuilder != null) {
// invoke the reference builder to handle additional policy metadata
@@ -139,7 +139,7 @@
for (InvocationConfiguration iConfig : (Collection<InvocationConfiguration>) iConfigMap.values()) {
iConfig.addTargetInterceptor(new InvokerInterceptor());
}
- ep.getConfiguredReference().setContextFactory(config);
+ ep.getConfiguredReference().setContextFactory(contextFactory);
} else if (object instanceof ExternalService) {
ExternalService es = (ExternalService) object;
@@ -147,7 +147,7 @@
return;
}
- FooExternalServiceContextFactory config = new FooExternalServiceContextFactory(es.getName(),
+ FooExternalServiceContextFactory contextFactory = new FooExternalServiceContextFactory(es.getName(),
new FooClientFactory());
ConfiguredService configuredService = es.getConfiguredService();
@@ -164,7 +164,7 @@
ProxyConfiguration pConfiguration = new ProxyConfiguration(qName, iConfigMap, serviceContract.getInterface().getClassLoader(), messageFactory);
proxyFactory.setBusinessInterface(serviceContract.getInterface());
proxyFactory.setProxyConfiguration(pConfiguration);
- config.addTargetProxyFactory(service.getName(), proxyFactory);
+ contextFactory.addTargetProxyFactory(service.getName(), proxyFactory);
configuredService.setProxyFactory(proxyFactory);
if (policyBuilder != null) {
// invoke the reference builder to handle additional policy metadata
@@ -175,7 +175,7 @@
iConfig.addTargetInterceptor(new InvokerInterceptor());
}
- es.getConfiguredService().setContextFactory(config);
+ es.getConfiguredService().setContextFactory(contextFactory);
} else {
return;
Modified: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java?rev=386066&r1=386065&r2=386066&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java Wed Mar 15 05:02:49 2006
@@ -147,12 +147,12 @@
RhinoScript invoker = new RhinoScript(component.getName(), script, properties, cl);
- JavaScriptContextFactory config = new JavaScriptContextFactory(component.getName(),
+ JavaScriptContextFactory contextFactory = new JavaScriptContextFactory(component.getName(),
scope, services, properties, invoker);
- addTargetInvocationChains(component, config);
- addComponentReferences(component, config);
- component.getComponentImplementation().setContextFactory(config);
+ addTargetInvocationChains(component, contextFactory);
+ addComponentReferences(component, contextFactory);
+ component.getComponentImplementation().setContextFactory(contextFactory);
}
/**
Modified: incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java?rev=386066&r1=386065&r2=386066&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/builder/JSContextFactoryBuilderTestCase.java Wed Mar 15 05:02:49 2006
@@ -34,16 +34,16 @@
component.initialize(new AssemblyModelContextImpl(new AssemblyFactoryImpl(), new SCDLAssemblyModelLoaderImpl(null), new ResourceLoaderImpl(Thread.currentThread().getContextClassLoader())));
jsBuilder.build(component);
ModuleScopeContext context = new ModuleScopeContext(new EventContextImpl());
- ContextFactory<InstanceContext> config = (ContextFactory) component.getComponentImplementation()
+ ContextFactory<InstanceContext> contextFactory = (ContextFactory) component.getComponentImplementation()
.getContextFactory();
- context.registerFactory(config);
+ context.registerFactory(contextFactory);
context.start();
context.onEvent(EventContext.MODULE_START, null);
- for (ProxyFactory proxyFactory : (Collection<ProxyFactory>) config.getTargetProxyFactories().values()) {
+ for (ProxyFactory proxyFactory : (Collection<ProxyFactory>) contextFactory.getTargetProxyFactories().values()) {
jsWireBuilder.completeTargetChain(proxyFactory, JavaScriptContextFactory.class, context);
proxyFactory.initialize();
}
- InstanceContext ctx = config.createContext();
+ InstanceContext ctx = contextFactory.createContext();
HelloWorldService hello = (HelloWorldService) ctx.getInstance(new QualifiedName("foo/HelloWorldService"));
Assert.assertNotNull(hello);
Assert.assertEquals("Hello foo", hello.hello("foo"));
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java?rev=386066&r1=386065&r2=386066&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractAggregateContext.java Wed Mar 15 05:02:49 2006
@@ -330,19 +330,19 @@
}
if (lifecycleState == RUNNING) {
for (Component component : newModule.getComponents()) {
- ContextFactory<InstanceContext> config = (ContextFactory<InstanceContext>) component
+ ContextFactory<InstanceContext> contextFactory = (ContextFactory<InstanceContext>) component
.getComponentImplementation().getContextFactory();
- wireSource(config);
- buildTarget(config);
- config.prepare(this);
+ wireSource(contextFactory);
+ buildTarget(contextFactory);
+ contextFactory.prepare(this);
try {
- if (config.getSourceProxyFactories() != null) {
- for (ProxyFactory sourceProxyFactory : (Collection<ProxyFactory>) config.getSourceProxyFactories()) {
+ if (contextFactory.getSourceProxyFactories() != null) {
+ for (ProxyFactory sourceProxyFactory : (Collection<ProxyFactory>) contextFactory.getSourceProxyFactories()) {
sourceProxyFactory.initialize();
}
}
- if (config.getTargetProxyFactories() != null) {
- for (ProxyFactory targetProxyFactory : (Collection<ProxyFactory>) config.getTargetProxyFactories()
+ if (contextFactory.getTargetProxyFactories() != null) {
+ for (ProxyFactory targetProxyFactory : (Collection<ProxyFactory>) contextFactory.getTargetProxyFactories()
.values()) {
targetProxyFactory.initialize();
}
@@ -353,19 +353,19 @@
}
for (EntryPoint ep : newModule.getEntryPoints()) {
- ContextFactory<InstanceContext> config = (ContextFactory<InstanceContext>) ep
+ ContextFactory<InstanceContext> contextFactory = (ContextFactory<InstanceContext>) ep
.getConfiguredReference().getContextFactory();
- wireSource(config);
- buildTarget(config);
- config.prepare(this);
+ wireSource(contextFactory);
+ buildTarget(contextFactory);
+ contextFactory.prepare(this);
try {
- if (config.getSourceProxyFactories() != null) {
- for (ProxyFactory sourceProxyFactory : (Collection<ProxyFactory>) config.getSourceProxyFactories()) {
+ if (contextFactory.getSourceProxyFactories() != null) {
+ for (ProxyFactory sourceProxyFactory : (Collection<ProxyFactory>) contextFactory.getSourceProxyFactories()) {
sourceProxyFactory.initialize();
}
}
- if (config.getTargetProxyFactories() != null) {
- for (ProxyFactory targetProxyFactory : (Collection<ProxyFactory>) config.getTargetProxyFactories()
+ if (contextFactory.getTargetProxyFactories() != null) {
+ for (ProxyFactory targetProxyFactory : (Collection<ProxyFactory>) contextFactory.getTargetProxyFactories()
.values()) {
targetProxyFactory.initialize();
}
@@ -376,18 +376,18 @@
}
for (ExternalService es : newModule.getExternalServices()) {
- ContextFactory<InstanceContext> config = (ContextFactory<InstanceContext>) es
+ ContextFactory<InstanceContext> contextFactory = (ContextFactory<InstanceContext>) es
.getConfiguredService().getContextFactory();
- buildTarget(config);
- config.prepare(this);
+ buildTarget(contextFactory);
+ contextFactory.prepare(this);
try {
- if (config.getSourceProxyFactories() != null) {
- for (ProxyFactory sourceProxyFactory : (Collection<ProxyFactory>) config.getSourceProxyFactories()) {
+ if (contextFactory.getSourceProxyFactories() != null) {
+ for (ProxyFactory sourceProxyFactory : (Collection<ProxyFactory>) contextFactory.getSourceProxyFactories()) {
sourceProxyFactory.initialize();
}
}
- if (config.getTargetProxyFactories() != null) {
- for (ProxyFactory targetProxyFactory : (Collection<ProxyFactory>) config.getTargetProxyFactories()
+ if (contextFactory.getTargetProxyFactories() != null) {
+ for (ProxyFactory targetProxyFactory : (Collection<ProxyFactory>) contextFactory.getTargetProxyFactories()
.values()) {
targetProxyFactory.initialize();
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java?rev=386066&r1=386065&r2=386066&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java Wed Mar 15 05:02:49 2006
@@ -66,9 +66,9 @@
} else {
targetName = targetService.getAggregatePart().getName();
}
- SystemEntryPointContextFactory config = new SystemEntryPointContextFactory(entryPoint.getName(),
+ SystemEntryPointContextFactory contextFactory = new SystemEntryPointContextFactory(entryPoint.getName(),
targetName);
- entryPoint.getConfiguredReference().setContextFactory(config);
+ entryPoint.getConfiguredReference().setContextFactory(contextFactory);
} catch (FactoryInitException e) {
e.addContextName(entryPoint.getName());
throw e;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java?rev=386066&r1=386065&r2=386066&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemExternalServiceBuilder.java Wed Mar 15 05:02:49 2006
@@ -55,9 +55,9 @@
}
SystemBinding binding = (SystemBinding)externalService.getBindings().get(0);
if (binding.getTargetName() != null) {
- SystemExternalServiceContextFactory config = new SystemExternalServiceContextFactory(externalService
+ SystemExternalServiceContextFactory contextFactory = new SystemExternalServiceContextFactory(externalService
.getName(), new InterAggregateReferenceFactory(binding.getTargetName()));
- externalService.getConfiguredService().setContextFactory(config);
+ externalService.getConfiguredService().setContextFactory(contextFactory);
} else if (externalService.getConfiguredService().getService().getServiceContract().getInterface() != null) {
// autowire
Class<?> claz = externalService.getConfiguredService().getService().getServiceContract().getInterface();
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java?rev=386066&r1=386065&r2=386066&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilderTestCase.java Wed Mar 15 05:02:49 2006
@@ -101,10 +101,10 @@
component.getConfiguredProperties().add(cProp);
builder.build(component);
- ContextFactory config = (ContextFactory) component.getComponentImplementation().getContextFactory();
- Assert.assertNotNull(config);
- config.prepare(createContext());
- InstanceContext ctx = (InstanceContext) config.createContext();
+ ContextFactory contextFactory = (ContextFactory) component.getComponentImplementation().getContextFactory();
+ Assert.assertNotNull(contextFactory);
+ contextFactory.prepare(createContext());
+ InstanceContext ctx = (InstanceContext) contextFactory.createContext();
ctx.start();
SystemComponentImpl instance = (SystemComponentImpl) ctx.getInstance(null);