Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java (original) +++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponent.java Tue Oct 17 15:30:49 2006 @@ -19,12 +19,9 @@ package org.apache.tuscany.container.ruby; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.tuscany.container.ruby.rubyscript.RubyScript; -import org.apache.tuscany.container.ruby.rubyscript.RubyScriptInstance; import org.apache.tuscany.spi.ObjectCreationException; import org.apache.tuscany.spi.component.CompositeComponent; import org.apache.tuscany.spi.component.ScopeContainer; @@ -37,6 +34,9 @@ import org.apache.tuscany.spi.wire.TargetInvoker; import org.apache.tuscany.spi.wire.WireService; +import org.apache.tuscany.container.ruby.rubyscript.RubyScript; +import org.apache.tuscany.container.ruby.rubyscript.RubyScriptInstance; + /** * The Ruby component implementation. */ @@ -47,7 +47,7 @@ private final Map<String, Object> properties; private RubyScript rubyScript; - + private String rubyClassName; public RubyComponent(String name, @@ -84,13 +84,13 @@ //referenced service. Class<?> businessInterface = wire.getServiceContract().getInterfaceClass(); RubyReferenceProxy interceptingProxy = new RubyReferenceProxy(businessInterface, - wireProxy, - rubyScript.getRubyEngine()); + wireProxy, + rubyScript.getRubyEngine()); context.put(wire.getReferenceName(), interceptingProxy.createProxy()); } } - - Object instance = rubyScript.createScriptInstance(context, rubyClassName); + + Object instance = rubyScript.createScriptInstance(context, rubyClassName); return instance; }
Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java (original) +++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentBuilder.java Tue Oct 17 15:30:49 2006 @@ -21,11 +21,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Hashtable; -import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.tuscany.container.ruby.rubyscript.RubyScript; import org.apache.tuscany.spi.builder.BuilderConfigException; import org.apache.tuscany.spi.component.Component; import org.apache.tuscany.spi.component.CompositeComponent; @@ -33,24 +31,25 @@ import org.apache.tuscany.spi.deployer.DeploymentContext; import org.apache.tuscany.spi.extension.ComponentBuilderExtension; import org.apache.tuscany.spi.model.ComponentDefinition; -import org.apache.tuscany.spi.model.Property; import org.apache.tuscany.spi.model.PropertyValue; import org.apache.tuscany.spi.model.Scope; import org.apache.tuscany.spi.model.ServiceDefinition; +import org.apache.tuscany.container.ruby.rubyscript.RubyScript; + /** * Extension point for creating [EMAIL PROTECTED] RubyComponent}s from an assembly configuration */ public class RubyComponentBuilder extends ComponentBuilderExtension<RubyImplementation> { - protected Class<RubyImplementation> getImplementationType() { + protected Class<RubyImplementation> getImplementationType() { return RubyImplementation.class; } @SuppressWarnings("unchecked") public Component build(CompositeComponent parent, - ComponentDefinition<RubyImplementation> componentDefinition, - DeploymentContext deploymentContext) throws BuilderConfigException { + ComponentDefinition<RubyImplementation> componentDefinition, + DeploymentContext deploymentContext) throws BuilderConfigException { String name = componentDefinition.getName(); RubyImplementation implementation = componentDefinition.getImplementation(); @@ -62,14 +61,14 @@ for (ServiceDefinition serviceDefinition : collection) { services.add(serviceDefinition.getServiceContract().getInterfaceClass()); } - + Map<String, Object> propertyValues = new Hashtable<String, Object>(); Collection<PropertyValue<?>> propValueSettings = componentDefinition.getPropertyValues().values(); for (PropertyValue propertyValue : propValueSettings) { propertyValues.put(propertyValue.getName(), - propertyValue.getValueFactory().getInstance()); + propertyValue.getValueFactory().getInstance()); } - + RubyScript rubyScript = implementation.getRubyScript(); // TODO: have ComponentBuilderExtension pass ScopeContainer in on build method? @@ -82,13 +81,13 @@ } return new RubyComponent(name, - rubyScript, - implementation.getRubyClassName(), - services, - propertyValues, - parent, - scopeContainer, - wireService, - workContext); + rubyScript, + implementation.getRubyClassName(), + services, + propertyValues, + parent, + scopeContainer, + wireService, + workContext); } } Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentType.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentType.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentType.java (original) +++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentType.java Tue Oct 17 15:30:49 2006 @@ -32,21 +32,6 @@ public RubyComponentType() { } - @SuppressWarnings("unchecked") - public RubyComponentType(ComponentType ct) { - // TODO: A bit hacky but this is so the non-Ruby .componentType side file can be used for now - setInitLevel(ct.getInitLevel()); - for (Object property : ct.getProperties().values()) { - add((Property) property); - } - for (Object reference : ct.getReferences().values()) { - add((ReferenceDefinition) reference); - } - for (Object service : ct.getServices().values()) { - add((ServiceDefinition) service); - } - } - public Scope getLifecycleScope() { return lifecycleScope; } Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentTypeLoader.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentTypeLoader.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentTypeLoader.java (original) +++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyComponentTypeLoader.java Tue Oct 17 15:30:49 2006 @@ -20,8 +20,6 @@ import java.net.URL; -import org.apache.tuscany.container.ruby.rubyscript.RubySCAConfig; -import org.apache.tuscany.container.ruby.rubyscript.RubyScript; import org.apache.tuscany.spi.annotation.Autowire; import org.apache.tuscany.spi.component.CompositeComponent; import org.apache.tuscany.spi.deployer.DeploymentContext; @@ -31,6 +29,10 @@ import org.apache.tuscany.spi.loader.LoaderException; import org.apache.tuscany.spi.loader.MissingResourceException; import org.apache.tuscany.spi.model.ComponentType; +import org.apache.tuscany.spi.model.ModelObject; + +import org.apache.tuscany.container.ruby.rubyscript.RubySCAConfig; +import org.apache.tuscany.container.ruby.rubyscript.RubyScript; /** * @version $Rev$ $Date$ @@ -39,8 +41,7 @@ private JavaInterfaceProcessorRegistry processorRegistry; - public RubyComponentTypeLoader(@Autowire - JavaInterfaceProcessorRegistry processorRegistry) { + public RubyComponentTypeLoader(@Autowire JavaInterfaceProcessorRegistry processorRegistry) { this.processorRegistry = processorRegistry; } @@ -48,12 +49,13 @@ protected Class<RubyImplementation> getImplementationClass() { return RubyImplementation.class; } - + protected RubyComponentType loadByIntrospection(CompositeComponent parent, - RubyImplementation implementation, - DeploymentContext deploymentContext) throws - MissingResourceException, - InvalidServiceContractException { + ModelObject object, + RubyImplementation implementation, + DeploymentContext deploymentContext) throws + MissingResourceException, + InvalidServiceContractException { RubyScript rubyScript = implementation.getRubyScript(); RubySCAConfig scaConfig = rubyScript.getSCAConfig(); @@ -83,7 +85,7 @@ RubyComponentType componentType; if (resource == null) { try { - componentType = loadByIntrospection(parent, implementation, deploymentContext); + componentType = loadByIntrospection(parent, null, implementation, deploymentContext); } catch (InvalidServiceContractException e) { throw new LoaderException("Invalid service contract", e); } @@ -92,17 +94,19 @@ } implementation.setComponentType(componentType); - - + + } + @SuppressWarnings("unchecked") protected RubyComponentType loadFromSidefile(URL url, DeploymentContext deploymentContext) throws LoaderException { - ComponentType ct = loaderRegistry.load(null, - url, - ComponentType.class, - deploymentContext); - RubyComponentType jsct = new RubyComponentType(ct); - return jsct; + // This should be fixed to pass in a RubyComponentType instead of null + RubyComponentType componentType = new RubyComponentType(); + return (RubyComponentType) loaderRegistry.load(null, + componentType, + url, + ComponentType.class, + deploymentContext); } private String getSideFileName(RubyImplementation implementation) { @@ -110,7 +114,7 @@ int lastDot = baseName.lastIndexOf('.'); if (lastDot != -1) { baseName = baseName.substring(0, - lastDot); + lastDot); } return baseName + ".componentType"; } Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyImplementationLoader.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyImplementationLoader.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyImplementationLoader.java (original) +++ incubator/tuscany/java/sca/services/containers/container.ruby/src/main/java/org/apache/tuscany/container/ruby/RubyImplementationLoader.java Tue Oct 17 15:30:49 2006 @@ -36,6 +36,8 @@ import org.apache.tuscany.spi.loader.LoaderRegistry; import org.apache.tuscany.spi.loader.LoaderUtil; import org.apache.tuscany.spi.loader.MissingResourceException; +import org.apache.tuscany.spi.model.ModelObject; + import org.osoa.sca.annotations.Constructor; /** @@ -56,6 +58,7 @@ } public RubyImplementation load(CompositeComponent parent, + ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException, LoaderException { Modified: incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/RubyImplementationLoaderTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/RubyImplementationLoaderTestCase.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/RubyImplementationLoaderTestCase.java (original) +++ incubator/tuscany/java/sca/services/containers/container.ruby/src/test/java/org/apache/tuscany/container/ruby/RubyImplementationLoaderTestCase.java Tue Oct 17 15:30:49 2006 @@ -56,7 +56,7 @@ replay(deploymentContext); try { - loader.load(parent, reader, deploymentContext); + loader.load(parent, null, reader, deploymentContext); fail(); } catch (MissingResourceException e) { // ok @@ -81,7 +81,7 @@ } }; try { - mockLoader.load(parent, reader, deploymentContext); + mockLoader.load(parent, null, reader, deploymentContext); fail(); } catch (MissingResourceException e) { assertEquals("foo.groovy", e.getMessage()); Modified: incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringImplementationLoader.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringImplementationLoader.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringImplementationLoader.java (original) +++ incubator/tuscany/java/sca/services/containers/container.spring/src/main/java/org/apache/tuscany/container/spring/impl/SpringImplementationLoader.java Tue Oct 17 15:30:49 2006 @@ -43,6 +43,7 @@ import org.apache.tuscany.spi.loader.MissingResourceException; import org.apache.tuscany.spi.model.BoundReferenceDefinition; import org.apache.tuscany.spi.model.BoundServiceDefinition; +import org.apache.tuscany.spi.model.ModelObject; import org.apache.tuscany.container.spring.model.SpringComponentType; import org.apache.tuscany.container.spring.model.SpringImplementation; @@ -75,7 +76,7 @@ @SuppressWarnings("unchecked") public SpringImplementation load(CompositeComponent parent, - XMLStreamReader reader, + ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException, LoaderException { @@ -97,7 +98,7 @@ QName qname = reader.getName(); if (SERVICE_ELEMENT.equals(qname)) { BoundServiceDefinition service = - (BoundServiceDefinition) registry.load(parent, reader, deploymentContext); + (BoundServiceDefinition) registry.load(parent, null, reader, deploymentContext); if (!type.isExposeAllBeans()) { String name = service.getName(); if (!type.getServiceTypes().containsKey(name)) { @@ -109,7 +110,7 @@ type.getDeclaredServices().put(service.getName(), service); } else if (REFERENCE_ELEMENT.equals(qname)) { BoundReferenceDefinition reference = - (BoundReferenceDefinition) registry.load(parent, reader, deploymentContext); + (BoundReferenceDefinition) registry.load(parent, null, reader, deploymentContext); type.getDeclaredReferences().put(reference.getName(), reference); } break; Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java (original) +++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/DataObjectLoader.java Tue Oct 17 15:30:49 2006 @@ -58,7 +58,7 @@ this.propertyQName = propertyQName; } - public ModelObject load(CompositeComponent parent, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException, LoaderException { + public ModelObject load(CompositeComponent parent, ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException, LoaderException { assert propertyQName.equals(reader.getName()); // TODO: We need a way to get TypeHelper from deploymentContext TypeHelper typeHelper = TypeHelper.INSTANCE; Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java (original) +++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOLoader.java Tue Oct 17 15:30:49 2006 @@ -59,7 +59,7 @@ return IMPORT_SDO; } - public ModelObject load(CompositeComponent parent, XMLStreamReader reader, DeploymentContext deploymentContext) + public ModelObject load(CompositeComponent parent, ModelObject object, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException, LoaderException { assert IMPORT_SDO.equals(reader.getName()); Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java (original) +++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/DataObjectLoaderTestCase.java Tue Oct 17 15:30:49 2006 @@ -60,7 +60,7 @@ } DataObjectLoader loader = new DataObjectLoader(name); DeploymentContext context = new RootDeploymentContext(getClass().getClassLoader(), inputFactory, new ModuleScopeContainer(), null); - ModelDataObject modelObject = (ModelDataObject) loader.load(null, reader, context); + ModelDataObject modelObject = (ModelDataObject) loader.load(null, null, reader, context); Assert.assertNotNull(modelObject.getDataObject()); Assert.assertTrue(modelObject.getDataObject().getString("myAttr").equals("helloworld.HelloWorldImpl")); } Modified: incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java (original) +++ incubator/tuscany/java/sca/services/databinding/databinding-sdo/src/test/java/org/apache/tuscany/databinding/sdo/ImportSDOLoaderTestCase.java Tue Oct 17 15:30:49 2006 @@ -44,13 +44,13 @@ public void testMinimal() throws XMLStreamException, LoaderException { String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0'/>"; XMLStreamReader reader = getReader(xml); - assertTrue(loader.load(null, reader, deploymentContext) instanceof SDOType); + assertTrue(loader.load(null, null, reader, deploymentContext) instanceof SDOType); } public void testLocation() throws XMLStreamException, LoaderException { String xml = "<import.sdo xmlns='http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0' location='ipo.xsd'/>"; XMLStreamReader reader = getReader(xml); - assertTrue(loader.load(null, reader, deploymentContext) instanceof SDOType); + assertTrue(loader.load(null, null, reader, deploymentContext) instanceof SDOType); } public void testFactory() throws XMLStreamException, LoaderException { @@ -58,7 +58,7 @@ + "factory='org.apache.tuscany.databinding.sdo.ImportSDOLoaderTestCase$MockFactory'/>"; XMLStreamReader reader = getReader(xml); assertFalse(inited); - assertTrue(loader.load(null, reader, deploymentContext) instanceof SDOType); + assertTrue(loader.load(null, null, reader, deploymentContext) instanceof SDOType); assertTrue(inited); } Modified: incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java (original) +++ incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java Tue Oct 17 15:30:49 2006 @@ -40,11 +40,9 @@ import org.apache.tuscany.spi.loader.InvalidValueException; import org.apache.tuscany.spi.loader.LoaderException; import org.apache.tuscany.spi.loader.LoaderRegistry; -import org.apache.tuscany.spi.loader.LoaderUtil; import org.apache.tuscany.spi.loader.MissingResourceException; import org.apache.tuscany.spi.model.DataType; import org.apache.tuscany.spi.model.ModelObject; -import org.apache.tuscany.spi.model.ServiceContract; /** * Loads a WSDL interface definition from an XML-based assembly file @@ -63,9 +61,9 @@ private InterfaceWSDLIntrospector introspector; @Constructor ({ "registry", "wsdlRegistry", "introspector" }) - public InterfaceWSDLLoader(@Autowire LoaderRegistry registry, - @Autowire WSDLDefinitionRegistry wsdlRegistry, - @Autowire InterfaceWSDLIntrospector introspector) { + public InterfaceWSDLLoader(@Autowire LoaderRegistry registry, + @Autowire WSDLDefinitionRegistry wsdlRegistry, + @Autowire InterfaceWSDLIntrospector introspector) { super(registry); this.wsdlRegistry = wsdlRegistry; this.introspector = introspector; @@ -76,9 +74,9 @@ } public WSDLServiceContract load( - CompositeComponent parent, - XMLStreamReader reader, - DeploymentContext deploymentContext) throws XMLStreamException, LoaderException { + CompositeComponent parent, + ModelObject object, XMLStreamReader reader, + DeploymentContext deploymentContext) throws XMLStreamException, LoaderException { assert INTERFACE_WSDL.equals(reader.getName()); String interfaceURI = reader.getAttributeValue(null, "interface"); @@ -88,12 +86,12 @@ String callbackURI = reader.getAttributeValue(null, "callbackInterface"); String wsdlLocation = reader.getAttributeValue(WSDLI, WSDLI_LOCATION); - + Map<Class<?>, ModelObject> extensions = new HashMap<Class<?>, ModelObject>(); while (true) { int event = reader.next(); if (event == XMLStreamConstants.START_ELEMENT) { - ModelObject mo = registry.load(parent, reader, deploymentContext); + ModelObject mo = registry.load(parent, null, reader, deploymentContext); if (mo != null) { extensions.put(mo.getClass(), mo); } @@ -102,7 +100,7 @@ break; } } - } + } // FIXME set the interaction scope // serviceContract.setInteractionScope(StAXUtil.interactionScope(reader.getAttributeValue(null, "scope"))); Modified: incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAImportLoader.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAImportLoader.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAImportLoader.java (original) +++ incubator/tuscany/java/sca/services/persistence/openjpa/src/main/java/org/apache/tuscany/service/openjpa/JPAImportLoader.java Tue Oct 17 15:30:49 2006 @@ -46,7 +46,8 @@ return IMPORT; } - public ModelObject load(CompositeComponent parent, XMLStreamReader reader, DeploymentContext deploymentContext) + public ModelObject load(CompositeComponent parent, ModelObject object, XMLStreamReader reader, + DeploymentContext deploymentContext) throws XMLStreamException, LoaderException { //ComponentDefinition definition = new ComponentDefinition() // TODO read in persisitence unit setting and properties, and set them as properties on the component Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java (original) +++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingLoader.java Tue Oct 17 15:30:49 2006 @@ -31,6 +31,7 @@ import org.apache.tuscany.spi.extension.LoaderExtension; import org.apache.tuscany.spi.loader.LoaderException; import org.apache.tuscany.spi.loader.LoaderRegistry; +import org.apache.tuscany.spi.model.ModelObject; /** * @version $Rev$ $Date$ @@ -49,7 +50,7 @@ } public TestBinding load(CompositeComponent parent, - XMLStreamReader reader, + ModelObject object, XMLStreamReader reader, DeploymentContext context) throws XMLStreamException, LoaderException { return new TestBinding(); } Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java?view=diff&rev=465084&r1=465083&r2=465084 ============================================================================== --- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java (original) +++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestSocketBindingLoader.java Tue Oct 17 15:30:49 2006 @@ -13,6 +13,7 @@ import org.apache.tuscany.spi.extension.LoaderExtension; import org.apache.tuscany.spi.loader.LoaderException; import org.apache.tuscany.spi.loader.LoaderRegistry; +import org.apache.tuscany.spi.model.ModelObject; /** * @version $Rev$ $Date$ @@ -31,7 +32,7 @@ } public TestSocketBinding load(CompositeComponent parent, - XMLStreamReader reader, + ModelObject object, XMLStreamReader reader, DeploymentContext context) throws XMLStreamException, LoaderException { String host = reader.getAttributeValue(null, "host"); int port; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
