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 2007/05/07 07:05:37 UTC

svn commit: r535742 - in /incubator/tuscany/java/sca/modules: core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/ core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/ core-spi/src/main/java/org/apache/tuscany/...

Author: jsdelfino
Date: Sun May  6 22:05:36 2007
New Revision: 535742

URL: http://svn.apache.org/viewvc?view=rev&rev=535742
Log:
More code cleanup. Removed obsolete classes.

Added:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessor.java   (with props)
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessorExtensionPoint.java   (with props)
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/ExtensibleWireProcessor.java   (with props)
Removed:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessorExtension.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/WireProcessorExtensionPoint.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/invocation/ChainHolder.java
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/invocation/
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeActivatorImpl.java
Modified:
    incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
    incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/DefaultWireProcessorExtensionPoint.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/JDKProxyService.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeComponentImpl.java
    incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntimeBuilder.java

Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java?view=diff&rev=535742&r1=535741&r2=535742
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java Sun May  6 22:05:36 2007
@@ -24,7 +24,7 @@
 
 import org.apache.tuscany.core.ExtensionPointRegistry;
 import org.apache.tuscany.core.ModuleActivator;
-import org.apache.tuscany.core.WireProcessorExtensionPoint;
+import org.apache.tuscany.core.RuntimeWireProcessorExtensionPoint;
 import org.apache.tuscany.core.databinding.processor.DataBindingJavaInterfaceProcessor;
 import org.apache.tuscany.core.databinding.transformers.Exception2ExceptionTransformer;
 import org.apache.tuscany.core.databinding.transformers.Input2InputTransformer;
@@ -100,10 +100,10 @@
             .getExtensionPoint(JavaInterfaceIntrospectorExtensionPoint.class);
         introspectors.addInterfaceVisitor(new DataBindingJavaInterfaceProcessor(dataBindings));
 
-        WireProcessorExtensionPoint wireProcessorExtensionPoint = registry
-            .getExtensionPoint(WireProcessorExtensionPoint.class);
+        RuntimeWireProcessorExtensionPoint wireProcessorExtensionPoint = registry
+            .getExtensionPoint(RuntimeWireProcessorExtensionPoint.class);
         if (wireProcessorExtensionPoint != null) {
-            wireProcessorExtensionPoint.register(new DataBindingRuntimeWireProcessor(mediator));
+            wireProcessorExtensionPoint.addWireProcessor(new DataBindingRuntimeWireProcessor(mediator));
         }
 
         DOMDataBinding domDataBinding = new DOMDataBinding();

Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java?view=diff&rev=535742&r1=535741&r2=535742
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java Sun May  6 22:05:36 2007
@@ -22,7 +22,7 @@
 import java.util.List;
 
 import org.apache.tuscany.core.RuntimeWire;
-import org.apache.tuscany.core.RuntimeWireProcessorExtension;
+import org.apache.tuscany.core.RuntimeWireProcessor;
 import org.apache.tuscany.databinding.Mediator;
 import org.apache.tuscany.interfacedef.DataType;
 import org.apache.tuscany.interfacedef.InterfaceContract;
@@ -35,7 +35,7 @@
  * 
  * @version $Rev$ $Date$
  */
-public class DataBindingRuntimeWireProcessor implements RuntimeWireProcessorExtension {
+public class DataBindingRuntimeWireProcessor implements RuntimeWireProcessor {
     private Mediator mediator;
 
     public DataBindingRuntimeWireProcessor(Mediator mediator) {

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessor.java?view=auto&rev=535742
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessor.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessor.java Sun May  6 22:05:36 2007
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core;
+
+/**
+ * Implementations are called after wires are decorated with policy and before they are connected.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface RuntimeWireProcessor {
+
+    /**
+     * Process the runtime wire to add interceptors
+     * 
+     * @param wire
+     */
+    void process(RuntimeWire wire);
+
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessorExtensionPoint.java?view=auto&rev=535742
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessorExtensionPoint.java (added)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessorExtensionPoint.java Sun May  6 22:05:36 2007
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core;
+
+import java.util.List;
+
+/**
+ * Acts as a delegating <code>WireProcessorExtensionPoint</code>, delegating
+ * processing of wires after policies have been applied and source an targets
+ * have been connected.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface RuntimeWireProcessorExtensionPoint {
+
+    /**
+     * Registers a wire-processor in the runtime
+     * 
+     * @param processor the processor to register
+     */
+    void addWireProcessor(RuntimeWireProcessor processor);
+
+    /**
+     * De-registers a wire-processor in the runtime
+     * 
+     * @param processor the processor to de-register
+     */
+    void removeWireProcessor(RuntimeWireProcessor processor);
+
+    /**
+     * Returns a list of registered wire-processors.
+     * 
+     * @return
+     */
+    List<RuntimeWireProcessor> getWireProcessors();
+    
+}

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessorExtensionPoint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/core/RuntimeWireProcessorExtensionPoint.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/DefaultWireProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/DefaultWireProcessorExtensionPoint.java?view=diff&rev=535742&r1=535741&r2=535742
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/DefaultWireProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/DefaultWireProcessorExtensionPoint.java Sun May  6 22:05:36 2007
@@ -21,30 +21,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.tuscany.core.RuntimeWire;
-import org.apache.tuscany.core.RuntimeWireProcessorExtension;
-import org.apache.tuscany.core.WireProcessorExtensionPoint;
+import org.apache.tuscany.core.RuntimeWireProcessor;
+import org.apache.tuscany.core.RuntimeWireProcessorExtensionPoint;
 
 /**
  * The default implementation of a <code>WireProcessorExtensionPoint</code>
  *
  * @version $Rev$ $Date$
  */
-public class DefaultWireProcessorExtensionPoint implements WireProcessorExtensionPoint {
+public class DefaultWireProcessorExtensionPoint implements RuntimeWireProcessorExtensionPoint {
 
-    private final List<RuntimeWireProcessorExtension> processors = new ArrayList<RuntimeWireProcessorExtension>();
+    private final List<RuntimeWireProcessor> processors = new ArrayList<RuntimeWireProcessor>();
 
-    public void process(RuntimeWire wire) {
-        for (RuntimeWireProcessorExtension processor : processors) {
-            processor.process(wire);
-        }
-    }
-
-    public void register(RuntimeWireProcessorExtension processor) {
+    public void addWireProcessor(RuntimeWireProcessor processor) {
         processors.add(processor);
     }
 
-    public void unregister(RuntimeWireProcessorExtension processor) {
+    public void removeWireProcessor(RuntimeWireProcessor processor) {
         processors.remove(processor);
+    }
+    
+    public List<RuntimeWireProcessor> getWireProcessors() {
+        return processors;
     }
 }

Added: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/ExtensibleWireProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/ExtensibleWireProcessor.java?view=auto&rev=535742
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/ExtensibleWireProcessor.java (added)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/ExtensibleWireProcessor.java Sun May  6 22:05:36 2007
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.invocation;
+
+import org.apache.tuscany.core.RuntimeWire;
+import org.apache.tuscany.core.RuntimeWireProcessor;
+import org.apache.tuscany.core.RuntimeWireProcessorExtensionPoint;
+
+/**
+ * The default implementation of an extensible <code>WireProcessor</code>
+ *
+ * @version $Rev$ $Date$
+ */
+public class ExtensibleWireProcessor implements RuntimeWireProcessor {
+    
+    private RuntimeWireProcessorExtensionPoint processors;
+
+    public ExtensibleWireProcessor(RuntimeWireProcessorExtensionPoint processors) {
+        this.processors = processors;
+    }
+    
+    public void process(RuntimeWire wire) {
+        for (RuntimeWireProcessor processor : processors.getWireProcessors()) {
+            processor.process(wire);
+        }
+    }
+
+}

Propchange: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/ExtensibleWireProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/ExtensibleWireProcessor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/JDKProxyService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/JDKProxyService.java?view=diff&rev=535742&r1=535741&r2=535742
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/JDKProxyService.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/invocation/JDKProxyService.java Sun May  6 22:05:36 2007
@@ -18,14 +18,11 @@
  */
 package org.apache.tuscany.core.invocation;
 
-import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.tuscany.core.RuntimeWire;
 import org.apache.tuscany.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.invocation.ChainHolder;
 import org.apache.tuscany.invocation.ProxyCreationException;
 import org.apache.tuscany.invocation.ProxyFactory;
 import org.apache.tuscany.spi.component.WorkContext;
@@ -53,16 +50,6 @@
     public <T> T createProxy(Class<T> interfaze, RuntimeWire wire) throws ProxyCreationException {
         assert interfaze != null;
         assert wire != null;
-        JDKInvocationHandler handler = new JDKInvocationHandler(interfaze, wire, context);
-        ClassLoader cl = interfaze.getClassLoader();
-        return interfaze.cast(Proxy.newProxyInstance(cl, new Class[] {interfaze}, handler));
-    }
-
-    public <T> T createProxy(Class<T> interfaze, RuntimeWire wire, Map<Method, ChainHolder> mapping)
-        throws ProxyCreationException {
-        assert interfaze != null;
-        assert wire != null;
-        assert mapping != null;
         JDKInvocationHandler handler = new JDKInvocationHandler(interfaze, wire, context);
         ClassLoader cl = interfaze.getClassLoader();
         return interfaze.cast(Proxy.newProxyInstance(cl, new Class[] {interfaze}, handler));

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java?view=diff&rev=535742&r1=535741&r2=535742
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java Sun May  6 22:05:36 2007
@@ -39,10 +39,10 @@
 import org.apache.tuscany.core.RuntimeComponentReference;
 import org.apache.tuscany.core.RuntimeComponentService;
 import org.apache.tuscany.core.RuntimeWire;
+import org.apache.tuscany.core.RuntimeWireProcessor;
 import org.apache.tuscany.core.ScopedImplementationProvider;
 import org.apache.tuscany.core.ServiceBindingActivator;
 import org.apache.tuscany.core.ServiceBindingProvider;
-import org.apache.tuscany.core.WireProcessorExtensionPoint;
 import org.apache.tuscany.core.invocation.InvocationChainImpl;
 import org.apache.tuscany.core.invocation.NonBlockingInterceptor;
 import org.apache.tuscany.interfacedef.IncompatibleInterfaceContractException;
@@ -64,7 +64,7 @@
     private final InterfaceContractMapper interfaceContractMapper;
     private final WorkContext workContext;
     private final WorkScheduler workScheduler;
-    private final WireProcessorExtensionPoint wireProcessorExtensionPoint;
+    private final RuntimeWireProcessor wireProcessor;
 
     /**
      * @param assemblyFactory
@@ -77,13 +77,13 @@
                                      InterfaceContractMapper interfaceContractMapper,
                                      WorkContext workContext,
                                      WorkScheduler workScheduler,
-                                     WireProcessorExtensionPoint wireProcessorExtensionPoint) {
+                                     RuntimeWireProcessor wireProcessor) {
         super();
         this.assemblyFactory = assemblyFactory;
         this.interfaceContractMapper = interfaceContractMapper;
         this.workContext = workContext;
         this.workScheduler = workScheduler;
-        this.wireProcessorExtensionPoint = wireProcessorExtensionPoint;
+        this.wireProcessor = wireProcessor;
     }
 
     /**
@@ -264,7 +264,7 @@
                 }
             }
             runtimeRef.addRuntimeWire(wire);
-            wireProcessorExtensionPoint.process(wire);
+            wireProcessor.process(wire);
         }
         for (ComponentService service : reference.getTargets()) {
             Component target = null;
@@ -321,7 +321,7 @@
                     wire.getTarget().getComponentService().addCallbackWire(wire);
                 }
             }
-            wireProcessorExtensionPoint.process(wire);
+            wireProcessor.process(wire);
         }
     }
 
@@ -399,7 +399,7 @@
         // }
 
         runtimeService.addRuntimeWire(wire);
-        wireProcessorExtensionPoint.process(wire);
+        wireProcessor.process(wire);
     }
 
     /**

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeComponentImpl.java?view=diff&rev=535742&r1=535741&r2=535742
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeComponentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/RuntimeComponentImpl.java Sun May  6 22:05:36 2007
@@ -19,10 +19,7 @@
 
 package org.apache.tuscany.core.runtime;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.tuscany.assembly.ComponentReference;
 import org.apache.tuscany.assembly.Property;

Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntimeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntimeBuilder.java?view=diff&rev=535742&r1=535741&r2=535742
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntimeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/ReallySmallRuntimeBuilder.java Sun May  6 22:05:36 2007
@@ -54,15 +54,16 @@
 import org.apache.tuscany.contribution.processor.URLArtifactProcessorExtensionPoint;
 import org.apache.tuscany.contribution.processor.impl.FolderContributionProcessor;
 import org.apache.tuscany.contribution.processor.impl.JarContributionProcessor;
-import org.apache.tuscany.contribution.resolver.DefaultModelResolver;
 import org.apache.tuscany.contribution.service.ContributionRepository;
 import org.apache.tuscany.contribution.service.ContributionService;
 import org.apache.tuscany.contribution.service.impl.ContributionRepositoryImpl;
 import org.apache.tuscany.contribution.service.impl.ContributionServiceImpl;
 import org.apache.tuscany.contribution.service.impl.PackageTypeDescriberImpl;
 import org.apache.tuscany.core.ExtensionPointRegistry;
-import org.apache.tuscany.core.WireProcessorExtensionPoint;
+import org.apache.tuscany.core.RuntimeWireProcessor;
+import org.apache.tuscany.core.RuntimeWireProcessorExtensionPoint;
 import org.apache.tuscany.core.invocation.DefaultWireProcessorExtensionPoint;
+import org.apache.tuscany.core.invocation.ExtensibleWireProcessor;
 import org.apache.tuscany.core.invocation.JDKProxyService;
 import org.apache.tuscany.core.runtime.ActivationException;
 import org.apache.tuscany.core.runtime.CompositeActivator;
@@ -118,13 +119,13 @@
         WorkScheduler workScheduler = new Jsr237WorkScheduler(workManager);
         
         // Create a wire post processor extension point
-        //FIXME do we still need this?
-        WireProcessorExtensionPoint wireProcessorExtensionPoint = new DefaultWireProcessorExtensionPoint();
-        registry.addExtensionPoint(WireProcessorExtensionPoint.class, wireProcessorExtensionPoint);
+        RuntimeWireProcessorExtensionPoint wireProcessors = new DefaultWireProcessorExtensionPoint();
+        registry.addExtensionPoint(RuntimeWireProcessorExtensionPoint.class, wireProcessors);
+        RuntimeWireProcessor wireProcessor = new ExtensibleWireProcessor(wireProcessors);
         
         // Create the composite activator
         CompositeActivator compositeActivator = new DefaultCompositeActivator(assemblyFactory, mapper, workContext,
-                                                           workScheduler, wireProcessorExtensionPoint);
+                                                           workScheduler, wireProcessor);
 
         return compositeActivator;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org