You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/21 08:29:47 UTC
svn commit: r379384 - in
/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core:
builder/impl/DefaultWireBuilder.java
context/impl/AbstractAggregateContext.java
invocation/InvocationConfiguration.java invocation/ProxyConfiguration.java
Author: jsdelfino
Date: Mon Feb 20 23:29:47 2006
New Revision: 379384
URL: http://svn.apache.org/viewcvs?rev=379384&view=rev
Log:
ported to new POJO model, merged conflicts
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.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/invocation/InvocationConfiguration.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java?rev=379384&r1=379383&r2=379384&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java Mon Feb 20 23:29:47 2006
@@ -18,8 +18,6 @@
import java.util.List;
import java.util.Map;
-import javax.wsdl.OperationType;
-
import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.core.builder.WireBuilder;
import org.apache.tuscany.core.context.QualifiedName;
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=379384&r1=379383&r2=379384&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 Mon Feb 20 23:29:47 2006
@@ -15,6 +15,8 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import javax.wsdl.Part;
+
import org.apache.tuscany.common.monitor.MonitorFactory;
import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.core.builder.RuntimeConfiguration;
@@ -46,11 +48,11 @@
import org.apache.tuscany.core.system.annotation.ParentContext;
import org.apache.tuscany.model.assembly.Component;
import org.apache.tuscany.model.assembly.EntryPoint;
-import org.apache.tuscany.model.assembly.ExtensibleModelObject;
+import org.apache.tuscany.model.assembly.Extensible;
import org.apache.tuscany.model.assembly.ExternalService;
import org.apache.tuscany.model.assembly.Module;
-import org.apache.tuscany.model.assembly.Part;
-import org.apache.tuscany.model.assembly.pojo.PojoModule;
+import org.apache.tuscany.model.assembly.Scope;
+import org.apache.tuscany.model.assembly.impl.AssemblyFactoryImpl;
/**
* The base implementation of an aggregate context
@@ -95,9 +97,9 @@
protected EventContext eventContext;
// The scopes for this context
- protected Map<Integer, ScopeContext> scopeContexts;
+ protected Map<Scope, ScopeContext> scopeContexts;
- protected Map<Integer, ScopeContext> immutableScopeContexts;
+ protected Map<Scope, ScopeContext> immutableScopeContexts;
// A component context name to scope context index
protected Map<String, ScopeContext> scopeIndex;
@@ -117,7 +119,8 @@
public AbstractAggregateContext() {
scopeIndex = new ConcurrentHashMap();
- module = new PojoModule();
+ //FIXME the factory should be injected
+ module = new AssemblyFactoryImpl().createModule();
}
public AbstractAggregateContext(String name, AggregateContext parent, ScopeStrategy strategy, EventContext ctx,
@@ -129,7 +132,8 @@
this.monitorFactory = factory;
scopeIndex = new ConcurrentHashMap();
parentContext = parent;
- module = new PojoModule();
+ //FIXME the factory should be injected
+ module = new AssemblyFactoryImpl().createModule();
}
// ----------------------------------
@@ -145,11 +149,11 @@
lifecycleState = INITIALIZING;
initializeScopes();
- Map<Integer, List<RuntimeConfiguration<SimpleComponentContext>>> configurationsByScope = new HashMap();
+ Map<Scope, List<RuntimeConfiguration<SimpleComponentContext>>> configurationsByScope = new HashMap();
if (configurations != null) {
for (RuntimeConfiguration source : configurations.values()) {
// FIXME scopes are defined at the interface level
- int sourceScope = source.getScope();
+ Scope sourceScope = source.getScope();
wireSource(source);
buildTarget(source);
scopeIndex.put(source.getName(), scopeContexts.get(sourceScope));
@@ -254,14 +258,14 @@
return parentContext;
}
- public void registerModelObjects(List<ExtensibleModelObject> models) throws ConfigurationException {
+ public void registerModelObjects(List<Extensible> models) throws ConfigurationException {
assert (models != null) : "Model object collection was null";
- for (ExtensibleModelObject model : models) {
+ for (Extensible model : models) {
registerModelObject(model);
}
}
- public void registerModelObject(ExtensibleModelObject model) throws ConfigurationException {
+ public void registerModelObject(Extensible model) throws ConfigurationException {
assert (model != null) : "Model object was null";
initializeScopes();
if (configurationContext != null) {
@@ -472,7 +476,7 @@
}
}
- public Map<Integer, ScopeContext> getScopeContexts() {
+ public Map<Scope, ScopeContext> getScopeContexts() {
initializeScopes();
return immutableScopeContexts;
}
@@ -486,7 +490,7 @@
*
* @throws ContextInitException
*/
- protected abstract void registerAutowire(ExtensibleModelObject model) throws ConfigurationException;
+ protected abstract void registerAutowire(Extensible model) throws ConfigurationException;
// ----------------------------------
// Protected methods
@@ -524,7 +528,7 @@
*/
protected void wireSource(RuntimeConfiguration source) {
// FIXME scopes are defined at the interface level
- int sourceScope = source.getScope();
+ Scope sourceScope = source.getScope();
if (source.getSourceProxyFactories() != null) {
for (ProxyFactory sourceFactory : ((Map<String, ProxyFactory>) source.getSourceProxyFactories()).values()) {
QualifiedName targetName = sourceFactory.getProxyConfiguration().getTargetName();
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationConfiguration.java?rev=379384&r1=379383&r2=379384&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationConfiguration.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/InvocationConfiguration.java Mon Feb 20 23:29:47 2006
@@ -16,6 +16,7 @@
*/
package org.apache.tuscany.core.invocation;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
@@ -24,7 +25,6 @@
import org.apache.tuscany.core.message.channel.impl.MessageChannelImpl;
import org.apache.tuscany.core.message.channel.impl.MessageDispatcher;
import org.apache.tuscany.core.message.handler.MessageHandler;
-import org.apache.tuscany.model.types.OperationType;
/**
* Represents the source or target-side of a wire, including proxy configuration information and invocation pipeline
@@ -76,7 +76,7 @@
public class InvocationConfiguration {
// the operation on the target that will utlimately be invoked
- private OperationType operation;
+ private Method operation;
// responsible for invoking a target instance, this is held by source-side invocation configurations
private TargetInvoker targetInvoker;
@@ -102,7 +102,7 @@
/**
* Creates an new invocation configuration for the given target operation
*/
- public InvocationConfiguration(OperationType operation) {
+ public InvocationConfiguration(Method operation) {
assert (operation != null) : "No operation type specified";
this.operation = operation;
}
@@ -110,7 +110,7 @@
/**
* Returns the target operation for the invocation configuration
*/
- public OperationType getOperationType() {
+ public Method getMethod() {
return operation;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java?rev=379384&r1=379383&r2=379384&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/ProxyConfiguration.java Mon Feb 20 23:29:47 2006
@@ -16,12 +16,12 @@
*/
package org.apache.tuscany.core.invocation;
+import java.lang.reflect.Method;
import java.util.Map;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.context.ScopeContext;
import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.model.types.OperationType;
/**
* Represents configuration information for creating a service reference proxy
@@ -30,7 +30,7 @@
*/
public class ProxyConfiguration {
- private Map<OperationType, InvocationConfiguration> configurations;
+ private Map<Method, InvocationConfiguration> configurations;
private ClassLoader proxyClassLoader;
@@ -46,7 +46,7 @@
// ----------------------------------
// TODO add "from"
- public ProxyConfiguration(QualifiedName targetName, Map<OperationType, InvocationConfiguration> invocationConfigs,
+ public ProxyConfiguration(QualifiedName targetName, Map<Method, InvocationConfiguration> invocationConfigs,
ClassLoader proxyClassLoader, Map<Integer, ScopeContext> scopeContainers, MessageFactory messageFactory) {
assert (invocationConfigs != null) : "No invocation configuration map specified";
this.targetName = targetName;
@@ -72,7 +72,7 @@
* Returns a collection of operation types to {@link InvocationConfiguration} mappings that represent the specific
* proxy configuration information for particular operations
*/
- public Map<OperationType, InvocationConfiguration> getInvocationConfigurations() {
+ public Map<Method, InvocationConfiguration> getInvocationConfigurations() {
return configurations;
}