Modified: tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java?rev=723218&r1=723217&r2=723218&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java (original) +++ tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java Wed Dec 3 22:05:21 2008 @@ -18,14 +18,13 @@ */ package org.apache.tuscany.sca.implementation.java.invocation; -import org.apache.tuscany.sca.core.invocation.TargetInvocationException; /** * Denotes an unknown operation sequence in a conversation * * @version $Rev$ $Date$ */ -public class InvalidConversationSequenceException extends TargetInvocationException { +public class InvalidConversationSequenceException extends Exception { private static final long serialVersionUID = -5744028391493899147L; public InvalidConversationSequenceException() {
Modified: tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java?rev=723218&r1=723217&r2=723218&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java (original) +++ tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java Wed Dec 3 22:05:21 2008 @@ -38,8 +38,7 @@ import org.apache.tuscany.sca.assembly.Reference; import org.apache.tuscany.sca.context.ComponentContextFactory; import org.apache.tuscany.sca.context.RequestContextFactory; -import org.apache.tuscany.sca.core.context.ComponentContextImpl; -import org.apache.tuscany.sca.core.context.InstanceWrapper; +import org.apache.tuscany.sca.core.factory.InstanceWrapper; import org.apache.tuscany.sca.core.factory.ObjectCreationException; import org.apache.tuscany.sca.core.factory.ObjectFactory; import org.apache.tuscany.sca.core.invocation.CallableReferenceObjectFactory; @@ -61,6 +60,7 @@ import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.runtime.RuntimeComponent; +import org.apache.tuscany.sca.runtime.RuntimeComponentContext; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; import org.apache.tuscany.sca.runtime.RuntimeWire; import org.osoa.sca.CallableReference; @@ -265,7 +265,7 @@ // We need to set the PropertyValueFactory on the ComponentContextImpl // so the ComponentContext can "de-marshal" the property type to a value // when the getProperty() method is called - ComponentContextImpl ccImpl = (ComponentContextImpl)component.getComponentContext(); + RuntimeComponentContext ccImpl = (RuntimeComponentContext)component.getComponentContext(); ccImpl.setPropertyValueFactory(propertyValueFactory); //setUpPolicyHandlers(); Modified: tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java?rev=723218&r1=723217&r2=723218&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java (original) +++ tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java Wed Dec 3 22:05:21 2008 @@ -21,7 +21,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.tuscany.sca.core.context.InstanceWrapper; +import org.apache.tuscany.sca.core.factory.InstanceWrapper; import org.apache.tuscany.sca.core.scope.Scope; import org.apache.tuscany.sca.core.scope.ScopeContainer; import org.apache.tuscany.sca.core.scope.ScopedRuntimeComponent; Modified: tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java?rev=723218&r1=723217&r2=723218&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java (original) +++ tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java Wed Dec 3 22:05:21 2008 @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.assembly.Service; import org.apache.tuscany.sca.context.ComponentContextFactory; import org.apache.tuscany.sca.context.RequestContextFactory; -import org.apache.tuscany.sca.core.context.InstanceWrapper; +import org.apache.tuscany.sca.core.factory.InstanceWrapper; import org.apache.tuscany.sca.core.factory.ObjectFactory; import org.apache.tuscany.sca.core.invocation.ProxyFactory; import org.apache.tuscany.sca.core.scope.Scope; @@ -124,7 +124,7 @@ if (ComponentContext.class.equals(type)) { objectFactory = new JavaComponentContextFactory(componentContextProvider); } else if (RequestContext.class.equals(type)) { - objectFactory = new RequestContextObjectFactory(requestContextFactory, proxyService); + objectFactory = new RequestContextObjectFactory(requestContextFactory, componentContextProvider.getComponent()); } else if (String.class.equals(type)) { objectFactory = new JavaComponentNameFactory(componentContextProvider); } else { Modified: tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java?rev=723218&r1=723217&r2=723218&view=diff ============================================================================== --- tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java (original) +++ tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java Wed Dec 3 22:05:21 2008 @@ -222,7 +222,7 @@ fv = cw.visitField(ACC_PROTECTED, getFieldName(propName), propClassSignature, propTypeSignature, null); // For Map property, we cannot have the XmlElement annotation - if (isElement) { + if (isElement && xmlAdapterClassSignature == null) { av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlElement;", true); av0.visit("name", propName); av0.visit("namespace", ""); @@ -235,6 +235,9 @@ } if (xmlAdapterClassSignature != null) { + av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlAnyElement;", true); + av0.visit("lax", Boolean.TRUE); + av0.visitEnd(); av0 = fv.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;", true); av0.visit("value", org.objectweb.asm.Type.getType(xmlAdapterClassSignature)); av0.visitEnd(); Modified: tuscany/java/sca/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl?rev=723218&r1=723217&r2=723218&view=diff ============================================================================== --- tuscany/java/sca/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl (original) +++ tuscany/java/sca/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl Wed Dec 3 22:05:21 2008 @@ -23,7 +23,8 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema"; name="StockExceptionTest"> <wsdl:types> <schema targetNamespace="http://www.example.com/stock"; xmlns="http://www.w3.org/2001/XMLSchema"; - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema";> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; + xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; jaxb:version="2.0"> <complexType name="StockOffer"> <sequence> <element name="symbol" minOccurs="1" type="xsd:string" /> @@ -61,6 +62,27 @@ <element name="MarketClosedFault" type="xsd:int" /> <element name="TestNotDeclaredAtSourceFault" type="xsd:string" /> + + <element name="anyElement"> + <complexType> + <sequence> + <element name="first" type="anyType"> + <annotation> + <appinfo> + <jaxb:dom /> + </appinfo> + </annotation> + </element> + <any maxOccurs="unbounded" processContents="skip"> + <annotation> + <appinfo> + <jaxb:dom /> + </appinfo> + </annotation> + </any> + </sequence> + </complexType> + </element> </schema> </wsdl:types> Modified: tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF?rev=723218&r1=723217&r2=723218&view=diff ============================================================================== --- tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF (original) +++ tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF Wed Dec 3 22:05:21 2008 @@ -21,7 +21,6 @@ Bundle-Description: Apache Tuscany SCA Node Implementation Import-Package: javax.xml.namespace, javax.xml.stream, - org.apache.tuscany.sca.assembly;version="1.4", org.apache.tuscany.sca.assembly.builder;version="1.4", org.apache.tuscany.sca.contribution;version="1.4", @@ -40,7 +39,6 @@ org.apache.tuscany.sca.work;version="1.4", org.apache.tuscany.sca.workspace;version="1.4", org.apache.tuscany.sca.workspace.builder;version="1.4", - org.osoa.sca;version="1.4", org.osoa.sca.annotations;version="1.4";resolution:=optional Bundle-SymbolicName: org.apache.tuscany.sca.node.impl Modified: tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=723218&r1=723217&r2=723218&view=diff ============================================================================== --- tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original) +++ tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Wed Dec 3 22:05:21 2008 @@ -299,6 +299,12 @@ // Create extension point registry extensionPoints = new DefaultExtensionPointRegistry(); + + // Use the runtime-enabled assembly factory + modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); + assemblyFactory = new RuntimeAssemblyFactory(); + modelFactories.addFactory(assemblyFactory); + // Create a monitor UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); @@ -318,18 +324,12 @@ } // Get XML input/output factories - modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); inputFactory = modelFactories.getFactory(XMLInputFactory.class); // Get contribution workspace and assembly model factories contributionFactory = modelFactories.getFactory(ContributionFactory.class); workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); - assemblyFactory = modelFactories.getFactory(AssemblyFactory.class); - // Use the runtime-enabled assembly factory - assemblyFactory = new RuntimeAssemblyFactory(); - modelFactories.addFactory(assemblyFactory); - // Create XML artifact processors xmlProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); compositeProcessor = xmlProcessors.getProcessor(Composite.class);
